Android: framework/Split off some packages to a new file

https://github.com/CyanogenMod/android_frameworks_base/commit/854f6f736b90d33b59b5a85bcecf72a416c43b7d

framework: Split off some packages to a new file

frameworks.jar is now hitting the maximum number of member classes(65535), resulting in the build failing with... trouble writing output: Too many methods: 65641; max is 65536. By package:     26 android    145 android.accessibilityservice    700 android.accounts    436 android.animation      8 android.annotation   3787 android.appAs a workaround, split off some packages to a new jar.This will probably need reviewing, the wiggle room left by movingthese packages is only about 1100 membersChange-Id: I470ac6833693676884747f9204f8238652c2b322

Showing 2 changed files with 40 additions and 2 deletions.Show Diff Stats
40 Android.mk
View file @ 854f6f7
......
@@ -28,10 +28,25 @@ framework_res_source_path := APPS/framework-res_intermediates/src
2828
 
2929
 # the library
3030
 # ============================================================
 31
+#
 32
+# These will be included in framework2 to avoid issues with the limit
 33
+# on the number of classes/dex
 34
+SECONDARY_FRAMEWORKS_SUBDIRS := \
 35
+        core/java/android/test \
 36
+        core/java/android/gesture \
 37
+        core/java/android/speech/srec \
 38
+        media/java/android/media/videoeditor \
 39
+        media/java/android/media/audiofx \
 40
+        media/mca/effect/java/android/media/effect \
 41
+        media/mca/effect/java/android/media/effect/effects
 42
+
3143
 include $(CLEAR_VARS)
3244
 
3345
 # FRAMEWORKS_BASE_SUBDIRS comes from build/core/pathmap.mk
3446
 LOCAL_SRC_FILES := $(call find-other-java-files,$(FRAMEWORKS_BASE_SUBDIRS))
 47
+SECONDARY_SRC_FILES := $(call find-other-java-files,$(SECONDARY_FRAMEWORKS_SUBDIRS))
 48
+
 49
+LOCAL_SRC_FILES := $(filter-out $(SECONDARY_SRC_FILES),$(LOCAL_SRC_FILES))
3550
 
3651
 # EventLogTags files.
3752
 LOCAL_SRC_FILES += \
......
@@ -252,6 +267,7 @@ $(full_classes_compiled_jar): $(framework_res_R_stamp)
252267
 $(LOCAL_INSTALLED_MODULE): | $(dir $(LOCAL_INSTALLED_MODULE))framework-res.apk
253268
 
254269
 framework_built := $(call java-lib-deps,framework)
 270
+framework_built += $(call java-lib-deps,framework2)
255271
 
256272
 # AIDL files to be preprocessed and included in the SDK,
257273
 # relative to the root of the build tree.
......
@@ -390,6 +406,7 @@ framework_docs_LOCAL_JAVA_LIBRARIES := \
390406
       core \
391407
       ext \
392408
       framework \
 409
+      framework2 \
393410
 
394411
 framework_docs_LOCAL_MODULE_CLASS := JAVA_LIBRARIES
395412
 framework_docs_LOCAL_DROIDDOC_HTML_DIR := docs/html
......
@@ -664,7 +681,7 @@ include $(CLEAR_VARS)
664681
 
665682
 LOCAL_SRC_FILES:=$(framework_docs_LOCAL_SRC_FILES)
666683
 LOCAL_INTERMEDIATE_SOURCES:=$(framework_docs_LOCAL_INTERMEDIATE_SOURCES)
667 
-LOCAL_JAVA_LIBRARIES:=$(framework_docs_LOCAL_JAVA_LIBRARIES) framework
 684
+LOCAL_JAVA_LIBRARIES:=$(framework_docs_LOCAL_JAVA_LIBRARIES) framework framework2
668685
 LOCAL_MODULE_CLASS:=$(framework_docs_LOCAL_MODULE_CLASS)
669686
 LOCAL_DROIDDOC_SOURCE_PATH:=$(framework_docs_LOCAL_DROIDDOC_SOURCE_PATH)
670687
 LOCAL_DROIDDOC_HTML_DIR:=$(framework_docs_LOCAL_DROIDDOC_HTML_DIR)
......
@@ -717,6 +734,26 @@ LOCAL_DX_FLAGS := --core-library
717734
 
718735
 include $(BUILD_JAVA_LIBRARY)
719736
 
 737
+include $(CLEAR_VARS)
 738
+
 739
+# FRAMEWORKS_BASE_SUBDIRS comes from build/core/pathmap.mk
 740
+LOCAL_SRC_FILES := $(call find-other-java-files,$(SECONDARY_FRAMEWORKS_SUBDIRS))
 741
+
 742
+LOCAL_NO_STANDARD_LIBRARIES := true
 743
+LOCAL_JAVA_LIBRARIES := bouncycastle core core-junit ext framework
 744
+
 745
+LOCAL_MODULE_TAGS := optional
 746
+LOCAL_MODULE := framework2
 747
+LOCAL_MODULE_CLASS := JAVA_LIBRARIES
 748
+
 749
+LOCAL_NO_EMMA_INSTRUMENT := true
 750
+LOCAL_NO_EMMA_COMPILE := true
 751
+
 752
+#LOCAL_JARJAR_RULES := $(LOCAL_PATH)/jarjar-rules.txt
 753
+
 754
+LOCAL_DX_FLAGS := --core-library
 755
+
 756
+include $(BUILD_JAVA_LIBRARY)
720757
 
721758
 # Include subdirectory makefiles
722759
 # ============================================================
......
@@ -726,3 +763,4 @@ include $(BUILD_JAVA_LIBRARY)
726763
 ifeq (,$(ONE_SHOT_MAKEFILE))
727764
 include $(call first-makefiles-under,$(LOCAL_PATH))
728765
 endif
 766
+
2 test-runner/Android.mk
View file @ 854f6f7
......
@@ -20,7 +20,7 @@ include $(CLEAR_VARS)
2020
 
2121
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
2222
 
23 
-LOCAL_JAVA_LIBRARIES := core core-junit framework
 23
+LOCAL_JAVA_LIBRARIES := core core-junit framework framework2
2424
 
2525
 LOCAL_MODULE:= android.test.runner
2626
 
0 notes on commit 854f6f7