diff options
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 39 |
1 files changed, 12 insertions, 27 deletions
diff --git a/Android.mk b/Android.mk index 304106518480..5fb736666cd7 100644 --- a/Android.mk +++ b/Android.mk @@ -194,7 +194,7 @@ LOCAL_INTERMEDIATE_SOURCES := \ $(framework-res-source-path)/com/android/internal/R.java LOCAL_NO_STANDARD_LIBRARIES := true -LOCAL_JAVA_LIBRARIES := core ext +LOCAL_JAVA_LIBRARIES := core core-junit ext LOCAL_MODULE := framework LOCAL_MODULE_CLASS := JAVA_LIBRARIES @@ -302,34 +302,14 @@ fwbase_dirs_to_document += core/config/sdk # Intentionally not included from libcore: # icu openssl suncompat support libcore_to_document := \ - annotation/src/main/java/java \ - archive/src/main/java/java \ - auth/src/main/java/javax \ - awt-kernel/src/main/java/java \ - concurrent/src/main/java \ - crypto/src/main/java/javax \ dalvik/src/main/java/dalvik \ json/src/main/java \ junit/src/main/java \ - logging/src/main/java/java \ luni/src/main/java/java \ - luni-kernel/src/main/java/java \ - math/src/main/java/java \ - nio/src/main/java/java \ - nio_char/src/main/java/java \ - prefs/src/main/java/java \ - regex/src/main/java/java \ - security/src/main/java/java \ - security/src/main/java/javax \ - security-kernel/src/main/java/java \ - sql/src/main/java/java \ - sql/src/main/java/javax \ - text/src/main/java/java \ - x-net/src/main/java/javax \ - xml/src/main/java/javax \ - xml/src/main/java/org/xml/sax \ + luni/src/main/java/javax \ + luni/src/main/java/org/xml/sax \ + luni/src/main/java/org/w3c \ xml/src/main/java/org/xmlpull/v1 \ - xml/src/main/java/org/w3c non_base_dirs := \ ../../external/apache-http/src/org/apache/http @@ -486,7 +466,8 @@ LOCAL_DROIDDOC_CUSTOM_ASSET_DIR:=assets-sdk include $(BUILD_DROIDDOC) -$(full_target): $(framework_built) +# $(gen), i.e. framework.aidl, is also needed while building against the current stub. +$(full_target): $(framework_built) $(gen) $(INTERNAL_PLATFORM_API_FILE): $(full_target) $(call dist-for-goals,sdk,$(INTERNAL_PLATFORM_API_FILE)) @@ -588,10 +569,14 @@ include $(BUILD_DROIDDOC) ext_dirs := \ ../../external/apache-http/src \ - ../../external/tagsoup/src + ../../external/tagsoup/src \ + ../../external/libphonenumber/java/src ext_src_files := $(call all-java-files-under,$(ext_dirs)) +ext_res_dirs := \ + ../../external/libphonenumber/java/src + # ==== the library ========================================= include $(CLEAR_VARS) @@ -599,7 +584,7 @@ LOCAL_SRC_FILES := $(ext_src_files) LOCAL_NO_STANDARD_LIBRARIES := true LOCAL_JAVA_LIBRARIES := core - +LOCAL_JAVA_RESOURCE_DIRS := $(ext_res_dirs) LOCAL_MODULE := ext LOCAL_NO_EMMA_INSTRUMENT := true |