您的位置：首页 > 移动开发 > Android开发

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

2012-09-10 17:26 393 查看
https://github.com/CyanogenMod/android_frameworks_base/commit/854f6f736b90d33b59b5a85bcecf72a416c43b7d

framework:Splitoffsomepackagestoanewfile

frameworks.jarisnowhittingthemaximumnumberofmemberclasses
(65535),resultinginthebuildfailingwith...

troublewritingoutput:Toomanymethods:65641;maxis65536.Bypackage:
26android
145android.accessibilityservice
700android.accounts
436android.animation
8android.annotation
3787android.app

Asaworkaround,splitoffsomepackagestoanewjar.

Thiswillprobablyneedreviewing,thewiggleroomleftbymoving
thesepackagesisonlyabout1100members

Change-Id:I470ac6833693676884747f9204f8238652c2b322



Showing2changedfileswith40additionsand2deletions.ShowDiffStats

40Android.mkViewfile@[code]854f6f7

......@@-28,10+28,25@@framework_res_source_path:=APPS/framework-res_intermediates/src[/code]
2828
2929
#thelibrary
3030
#============================================================
31
+#
32
+#Thesewillbeincludedinframework2toavoidissueswiththelimit
33
+#onthenumberofclasses/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_SUBDIRScomesfrombuild/core/pathmap.mk
3446
LOCAL_SRC_FILES:=$(callfind-other-java-files,$(FRAMEWORKS_BASE_SUBDIRS))
47
+SECONDARY_SRC_FILES:=$(callfind-other-java-files,$(SECONDARY_FRAMEWORKS_SUBDIRS))
48
+
49
+LOCAL_SRC_FILES:=$(filter-out$(SECONDARY_SRC_FILES),$(LOCAL_SRC_FILES))
3550
3651
#EventLogTagsfiles.
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:=$(calljava-lib-deps,framework)
270
+framework_built+=$(calljava-lib-deps,framework2)
255271
256272
#AIDLfilestobepreprocessedandincludedintheSDK,
257273
#relativetotherootofthebuildtree.
......
@@-390,6+406,7@@framework_docs_LOCAL_J***A_LIBRARIES:=\
390406
core\
391407
ext\
392408
framework\
409
+framework2\
393410
394411
framework_docs_LOCAL_MODULE_CLASS:=J***A_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_J***A_LIBRARIES:=$(framework_docs_LOCAL_J***A_LIBRARIES)framework
684
+LOCAL_J***A_LIBRARIES:=$(framework_docs_LOCAL_J***A_LIBRARIES)frameworkframework2
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_J***A_LIBRARY)
719736
737
+include$(CLEAR_VARS)
738
+
739
+#FRAMEWORKS_BASE_SUBDIRScomesfrombuild/core/pathmap.mk
740
+LOCAL_SRC_FILES:=$(callfind-other-java-files,$(SECONDARY_FRAMEWORKS_SUBDIRS))
741
+
742
+LOCAL_NO_STANDARD_LIBRARIES:=true
743
+LOCAL_J***A_LIBRARIES:=bouncycastlecorecore-junitextframework
744
+
745
+LOCAL_MODULE_TAGS:=optional
746
+LOCAL_MODULE:=framework2
747
+LOCAL_MODULE_CLASS:=J***A_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_J***A_LIBRARY)
720757
721758
#Includesubdirectorymakefiles
722759
#============================================================
......
@@-726,3+763,4@@include$(BUILD_J***A_LIBRARY)
726763
ifeq(,$(ONE_SHOT_MAKEFILE))
727764
include$(callfirst-makefiles-under,$(LOCAL_PATH))
728765
endif
766
+
2test-runner/Android.mkViewfile@
854f6f7

......
@@-20,7+20,7@@include$(CLEAR_VARS)
2020
2121
LOCAL_SRC_FILES:=$(callall-java-files-under,src)
2222
23
-LOCAL_J***A_LIBRARIES:=corecore-junitframework
23
+LOCAL_J***A_LIBRARIES:=corecore-junitframeworkframework2
2424
2525
LOCAL_MODULE:=android.test.runner
2626
0notesoncommit
854f6f7

                                            

                                        

                        
                        内容来自用户分享和网络整理，不保证内容的准确性，如有侵权内容，可联系管理员处理 点击这里给我发消息 
                    

                    

                    

                        

                         标签： 
                                                

                        

                    


                

            


            

                
相关文章推荐

                

                
            

        

        

            

            
            

                

                    
新的分享

                    

                        
                    

                

            


            

                

                    
章节导航