tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
platform_build/core/java_library.mk

101 lines
3.5 KiB
Makefile
Raw Normal View History

auto import from //depot/cupcake/@135843
2009-03-04 04:28:42 +01:00
###########################################################
## Standard rules for building a java library.
##
###########################################################
Record module type statistics Creates a build_system_stats.txt build artifact that contains statistics on how many BUILD_* modules are defined in a build. Also writes out information about the Soong module types sent from the Soong build. Merged-In: Iaf0c7062f542dc6942b5349854f3d49267cac4a5 Change-Id: Iaf0c7062f542dc6942b5349854f3d49267cac4a5
2016-07-26 01:03:53 +02:00
$(call record-module-type,JAVA_LIBRARY)
auto import from //depot/cupcake/@135843
2009-03-04 04:28:42 +01:00
ifdef LOCAL_IS_HOST_MODULE
$(error $(LOCAL_PATH): Host java libraries must use BUILD_HOST_JAVA_LIBRARY)
endif
LOCAL_MODULE_SUFFIX := $(COMMON_JAVA_PACKAGE_SUFFIX)
LOCAL_MODULE_CLASS := JAVA_LIBRARIES
ifneq (,$(LOCAL_ASSET_DIR))
$(error $(LOCAL_PATH): Target java libraries may not set LOCAL_ASSET_DIR)
endif
Support to build static Java library with Android resource Bug: 5714516 The rationale behind this change: - the library is compiled into a jar file, but its R class is generated making the constant not constant (static, not final static) (aapt option --non-constant-id). Also the jar file does not contain the R class. - this allows the integer value to not be inlined in the compiled class files. Note that this prevents using switch statements. - the main project use this jar file as a normal static library: it will add all the class files except the R.class. - the main project uses the library res folder as a resource folder with lower priority than the main project (basically the main project is an overlay. This is accomplished using aapt's --auto-add-overlay to handle resources only in the main project (which the normal overlay mechanism doesn't allow). - the main project creates R classes in the main project's package but also in the library's package. This is done with aapt's --extra-packages which accept as many packages as needed, separated by a :. - manifest merging is not done yet, so activities/services/permissions/etc... have to be manually declared in the main app. To use a static library with Android resource in your app, 1. Add the library's resource dir to your app as an overlay: LOCAL_RESOURCE_DIR := <app_resource_dir> <static_library_resource_dirs> 2. Set the proper aapt flags: LOCAL_AAPT_FLAGS := <apps_own_flags> --auto-add-overlay \ --extra-packages <lib1_package_name>:<lib2_package_name>:... Change-Id: Ifb4d2300b952ea4aaee74da1bb0c6c72ea0698a3
2011-12-14 23:29:28 +01:00
ifneq (true,$(LOCAL_IS_STATIC_JAVA_LIBRARY))
auto import from //depot/cupcake/@135843
2009-03-04 04:28:42 +01:00
ifneq (,$(LOCAL_RESOURCE_DIR))
$(error $(LOCAL_PATH): Target java libraries may not set LOCAL_RESOURCE_DIR)
endif
Make it a fatal error if no source files for Java module. Change-Id: Ia04158c11381b6b1687b9d5c699a9ea8ae3cb317
2013-08-28 20:16:06 +02:00
# base_rules.mk looks at this
auto import from //depot/cupcake/@135843
2009-03-04 04:28:42 +01:00
all_res_assets :=
Make it a fatal error if no source files for Java module. Change-Id: Ia04158c11381b6b1687b9d5c699a9ea8ae3cb317
2013-08-28 20:16:06 +02:00
endif
auto import from //depot/cupcake/@135843
2009-03-04 04:28:42 +01:00
LOCAL_BUILT_MODULE_STEM := javalib.jar
Delete jack support Remove all support for running jack. Bug: 65302138 Test: m -j checkbuild Change-Id: I1ef87c88af3f2689f8b0dcf1a01c958b16159631 Merged-In: I1ef87c88af3f2689f8b0dcf1a01c958b16159631 (cherry picked from commit 5db5d31d732a04d07052217602790a3fec8208f8)
2017-09-27 23:28:41 +02:00
# For java libraries, other modules should depend on
# out/target/common/obj/JAVA_LIBRARIES/.../classes.jar.
Rearrange java library outputs Jack can silently handle using a java library as a static java library by merging in the java library dex file. This causes problems when switching to javac, because dex doesn't support dex merging with multidex enabled? Make the output files consistent between java libraries and static java libraries. Java libraries will now produce: classes-pre-proguard.jar: the classes before proguard processing classes.jar: the final jar file containing classes before dexing javalib.jar: a jar containing classes.dex Static java libraries will eventually only produce classes-pre-proguard.jar and classes.jar. All inter-library linking is done with classes.jar, so a java library can be used as a static java library. There are too many dependencies outside the build system that expect javalib.jar to exist for static and host java libraries, so for now continue to build a javalib.jar that is a copy of classes.jar. Test: m -j ANDROID_COMPILE_WITH_JACK=false java Test: m -j java Bug: 36901093 Change-Id: I6730e2d3ec38004874265b2a690442dec57b33f4
2017-03-29 22:53:29 +02:00
# There are some dependencies outside the build system that assume static
# java libraries produce javalib.jar, so we will copy classes.jar there too.
Set the intermediate dirs before using them. Change-Id: Ibdab1234ca8c5a86c5226ed71e84374c3fcd7a90
2010-09-27 23:53:39 +02:00
intermediates.COMMON := $(call local-intermediates-dir,COMMON)
Change built module of static java libraries Set LOCAL_BUILT_MODULE of static java libraries when Jack is enabled to classes.jack instead of javalib.jar. This allows that running mm in those libraries will build classes.jack instead of the jar. Change-Id: I96b4b227848e971df96331b3f0cc731e856be349
2015-02-05 16:10:58 +01:00
common_javalib.jar := $(intermediates.COMMON)/javalib.jar
dex_preopt: Use the unstripped jar file for generating profiles. We were previously using LOCAL_BUILT_MODULE, which wouldn't work in the case that "nostripping" wasn't specified (i.e when we stripped). The issue is that the built module has its classes.dex entry stripped, which means that profman can't do anything meaningful with it. In this change, we use the right set of files for JAVA_LIBRARIES as well as prebuilt PACKAGES. Fixing apps built from source is a larger task and has been left for a future change. Depending on ART changes, we might need to disable stripping for all apps and/or align userdebug and user builds with each other. This will be tackled separately. Test: make Bug: 64896089 Change-Id: I4fd256d187b66763f354cc6001953469c2cd8fbb
2017-08-22 16:47:08 +02:00
dex_preopt_profile_src_file := $(common_javalib.jar)
Move odex related files to product-specific dir. For target Java libraries, now the LOCAL_BUILT_MODULE includes both javalib.jar and the .odex file, if dexpreopt is enabled. These 2 files are moved to a product-specific dir in this change. For target Java Libraries, $(intermediates) now points to the product-specific dir. There is still a javalib.jar in the $(intermediates.COMMON) dir, which is used as dependency. Nothing is changed for host Java libraries. Change-Id: I2546dbb940c74537864ca002d1acb49bb731fbbc
2010-09-25 03:09:04 +02:00
LOCAL_INTERMEDIATE_TARGETS += $(common_javalib.jar)
Allow to run Proguard on static Java library 1. Let aapt output the proguard_options file 2. If proguard is enabled, switch the dependency from $(full_classes_jar) to $(full_classes_proguard_jar). Change-Id: Idc641a1515b8899a4623a2aeec5cd494f6c1c1c5
2013-03-26 20:42:32 +01:00
ifeq ($(LOCAL_PROGUARD_ENABLED),disabled)
LOCAL_PROGUARD_ENABLED :=
endif
Support EMMA_INSTRUMENT in both full and unbundled builds. Bug: 6987838 - With this change, use "EMMA_INSTRUMENT=true" to enable emma in full or unbundled build. - You don't need to add "LOCAL_STATIC_JAVA_LIBRARIES += emma" any more for unbundled apps. - Now a single var LOCAL_EMMA_INSTRUMENT replaces the previous LOCAL_NO_EMMA_INSTRUMENT and LOCAL_NO_EMMA_COMPILE. - By default, if EMMA_INSTRUMENT is true, emma is enabled for only non-test apps. - A new global var EMMA_INSTRUMENT_STATIC. It enables EMMA_INSTRUMENT and builds emma into apk/jar as static library, instead of using emma as part of shared library core.jar. Change-Id: I0aa219e83074879ececc159b5b07c39eb07ccc00
2012-08-22 01:59:01 +02:00
ifeq (true,$(EMMA_INSTRUMENT))
ifeq (true,$(LOCAL_EMMA_INSTRUMENT))
ifeq (true,$(EMMA_INSTRUMENT_STATIC))
Support code coverage with Jack Building an app with Jack and with the environment variable EMMA_INSTRUMENT_STATIC set to true will apply code coverage onto the app targeting Jacoco. Bug: 20115492 Change-Id: Ief3640fa3faa466f7f6aaa9739e06d3db24110a0
2015-11-19 17:53:00 +01:00
LOCAL_STATIC_JAVA_LIBRARIES += jacocoagent
Use proguard.jacoco.flags for EMMA_INSTRUMENT_STATIC Add proguard.jacoco.flags whenever EMMA_INSTRUMENT_STATIC is set so that com.vladium.emma.rt.RT is not stripped. Test: m EMMA_INSTRUMENT=true EMMA_INSTRUMENT_STATIC=true Change-Id: Ie64a283d95e8bbf426cd39675d70a3a58768ebc7
2018-01-03 21:39:11 +01:00
# Exclude jacoco classes from proguard
LOCAL_PROGUARD_FLAGS += -include $(BUILD_SYSTEM)/proguard.jacoco.flags
Support EMMA_INSTRUMENT in both full and unbundled builds. Bug: 6987838 - With this change, use "EMMA_INSTRUMENT=true" to enable emma in full or unbundled build. - You don't need to add "LOCAL_STATIC_JAVA_LIBRARIES += emma" any more for unbundled apps. - Now a single var LOCAL_EMMA_INSTRUMENT replaces the previous LOCAL_NO_EMMA_INSTRUMENT and LOCAL_NO_EMMA_COMPILE. - By default, if EMMA_INSTRUMENT is true, emma is enabled for only non-test apps. - A new global var EMMA_INSTRUMENT_STATIC. It enables EMMA_INSTRUMENT and builds emma into apk/jar as static library, instead of using emma as part of shared library core.jar. Change-Id: I0aa219e83074879ececc159b5b07c39eb07ccc00
2012-08-22 01:59:01 +02:00
endif # LOCAL_EMMA_INSTRUMENT
endif # EMMA_INSTRUMENT_STATIC
else
LOCAL_EMMA_INSTRUMENT := false
endif # EMMA_INSTRUMENT
Move dexpreopting to Soong Move the dexpreopting logic into Soong. Make modules will be dexpreopted by executing the Soong logic in the standalone dexpreopt_gen binary, which will generate scripts that will perform dexpreopting for each module. Export global configuration as JSON to $OUT/dexpreopt.config, which will be used by dexpreopt_gen and Soong, and per-module JSON configuration that will be used by dexpreopt_gen. This relands I59b20c931ee3e5a8d35eb30da4148691c5095502, I39d580999947ee54cfefe875b57a028be5333bd7, Ie7daa94e107d53eff075ca58dbe721bd9d7fc8c2 and Ica006a007d112c232311435aaac0c0e476232b67, with a minor update to match the changes made to dexpreopt_gen arguments and a fix to correctly keep dexpreopt disabled on mac builds. Bug: 119412419 Bug: 120273280 Test: no differences to dexpreopt outputs on aosp_sailfish system/, only expected changes to dexpreopt outputs on system_other (.vdex files for privileged Soong modules no longer incorrectly contain .dex contents). Change-Id: I25163e91886cea6941afa25cdb529ed053278dcb
2018-11-17 06:26:33 +01:00
my_dex_jar := $(common_javalib.jar)
auto import from //depot/cupcake/@135843
2009-03-04 04:28:42 +01:00
#################################
include $(BUILD_SYSTEM)/java.mk
#################################
ifeq ($(LOCAL_IS_STATIC_JAVA_LIBRARY),true)
Rearrange java library outputs Jack can silently handle using a java library as a static java library by merging in the java library dex file. This causes problems when switching to javac, because dex doesn't support dex merging with multidex enabled? Make the output files consistent between java libraries and static java libraries. Java libraries will now produce: classes-pre-proguard.jar: the classes before proguard processing classes.jar: the final jar file containing classes before dexing javalib.jar: a jar containing classes.dex Static java libraries will eventually only produce classes-pre-proguard.jar and classes.jar. All inter-library linking is done with classes.jar, so a java library can be used as a static java library. There are too many dependencies outside the build system that expect javalib.jar to exist for static and host java libraries, so for now continue to build a javalib.jar that is a copy of classes.jar. Test: m -j ANDROID_COMPILE_WITH_JACK=false java Test: m -j java Bug: 36901093 Change-Id: I6730e2d3ec38004874265b2a690442dec57b33f4
2017-03-29 22:53:29 +02:00
# There are some dependencies outside the build system that assume classes.jar
# is available as javalib.jar so copy it there too.
Remove proguard support R8 is always used now. Bug: 111885749 Test: m checkbuild Change-Id: I9ae586c6360f2e3050422090b4e08f27ae167758
2018-07-25 22:41:42 +02:00
$(eval $(call copy-one-file,$(full_classes_pre_proguard_jar),$(common_javalib.jar)))
auto import from //depot/cupcake/@135843
2009-03-04 04:28:42 +01:00
Remove proguard support R8 is always used now. Bug: 111885749 Test: m checkbuild Change-Id: I9ae586c6360f2e3050422090b4e08f27ae167758
2018-07-25 22:41:42 +02:00
$(eval $(call copy-one-file,$(full_classes_pre_proguard_jar),$(LOCAL_BUILT_MODULE)))
Move odex related files to product-specific dir. For target Java libraries, now the LOCAL_BUILT_MODULE includes both javalib.jar and the .odex file, if dexpreopt is enabled. These 2 files are moved to a product-specific dir in this change. For target Java Libraries, $(intermediates) now points to the product-specific dir. There is still a javalib.jar in the $(intermediates.COMMON) dir, which is used as dependency. Nothing is changed for host Java libraries. Change-Id: I2546dbb940c74537864ca002d1acb49bb731fbbc
2010-09-25 03:09:04 +02:00
auto import from //depot/cupcake/@135843
2009-03-04 04:28:42 +01:00
else # !LOCAL_IS_STATIC_JAVA_LIBRARY
Move odex related files to product-specific dir. For target Java libraries, now the LOCAL_BUILT_MODULE includes both javalib.jar and the .odex file, if dexpreopt is enabled. These 2 files are moved to a product-specific dir in this change. For target Java Libraries, $(intermediates) now points to the product-specific dir. There is still a javalib.jar in the $(intermediates.COMMON) dir, which is used as dependency. Nothing is changed for host Java libraries. Change-Id: I2546dbb940c74537864ca002d1acb49bb731fbbc
2010-09-25 03:09:04 +02:00
$(common_javalib.jar): PRIVATE_DEX_FILE := $(built_dex)
Move proguard before classes.jar Downstream users of a library always link against javalib.jar, which is either the dex jar for java libraries or a copy of proguard.classes.jar for static java libraries. In preparation for making java libraries a superset of static java libraries, make classes.jar always be the final class-containing jar for use downstream, and always create a classes-pre-proguard.jar for users that need a jar without shrinking or obfuscation. Also rename the intermediates to be consitent: classes-<tool>.jar Test: m -j ANDROID_COMPILE_WITH_JACK=false java Change-Id: I3df8b9a4edcd5db996f1fedc54c8a782d4f36a92 Merged-In: I3df8b9a4edcd5db996f1fedc54c8a782d4f36a92 (cherry picked from commit 6fabefa88eb7c0f90e6652c59e46e2fa12b979bb)
2017-04-06 00:30:42 +02:00
$(common_javalib.jar): PRIVATE_SOURCE_ARCHIVE := $(full_classes_pre_proguard_jar)
Replace some uses of zip with merge_zips, soong_zip, and zip2zip zip maintains permissions when adding files to zips, which causes the final jars and apks to change based on the umask of the build. Move some of the rules that were using zip to soong_zip instead. Since soong_zip doesn't support adding files to existing zips, create a new zip file for each part of the package creation process and then merge them together at the end with merge_zips. Bug: 69500920 Test: m checkbuild Change-Id: Id253df776ce19ec4cac3a36fa470a50461ea3cad
2018-09-14 22:39:07 +02:00
$(common_javalib.jar): $(MERGE_ZIPS) $(SOONG_ZIP) $(ZIP2ZIP)
Fix some java library dependencies Bug: 130111713 Test: treehugger Test: build system image w/RBE Change-Id: I2c76701c1ad396c1b13f873297785c736fba544d
2019-06-12 23:18:31 +02:00
$(common_javalib.jar) : $(full_classes_pre_proguard_jar) $(built_dex) $(java_resource_sources) | $(ZIPTIME) $(ZIPALIGN)
Integrate dexpreopt into the build system. Change-Id: Id67f85d0f5c8674f5bc22e431114ca73625811ef
2010-09-18 01:36:06 +02:00
@echo "target Jar: $(PRIVATE_MODULE) ($@)"
Replace some uses of zip with merge_zips, soong_zip, and zip2zip zip maintains permissions when adding files to zips, which causes the final jars and apks to change based on the umask of the build. Move some of the rules that were using zip to soong_zip instead. Since soong_zip doesn't support adding files to existing zips, create a new zip file for each part of the package creation process and then merge them together at the end with merge_zips. Bug: 69500920 Test: m checkbuild Change-Id: Id253df776ce19ec4cac3a36fa470a50461ea3cad
2018-09-14 22:39:07 +02:00
rm -rf $@.parts && mkdir -p $@.parts
$(call create-dex-jar,$@.parts/dex.zip,$(PRIVATE_DEX_FILE))
$(call extract-resources-jar,$@.parts/res.zip,$(PRIVATE_SOURCE_ARCHIVE))
$(MERGE_ZIPS) -j $@.tmp $@.parts/dex.zip $@.parts/res.zip
rm -rf $@.parts
Revert "Revert "Add Turbine as part of java build toolchain in Make."" This reverts commit 33dcd0c5ebd2a8d8022bfd4ed31ae674d4cfe77e. Reason for revert: <stub.jar.toc needs classes.jar.toc which is no longer existed after Turbine was introduced. So use classes.jar to represent stub.jar.toc> Bug: b/64308460 Test: m clean && time m -j32 ANDROID_COMPILE_WITH_JACK=true Change-Id: If618993f1e0c789d93cc15664212603f994fd460
2017-08-31 23:43:04 +02:00
$(hide) $(ZIPTIME) $@.tmp
$(call commit-change-for-toc,$@)
Tighter control of stripping in dex_preopt_odex_install. - Move logic to uncompress dexs in an APK in dex_preopt_odex_install.mk and definitions.mk. - Explicitly mark nostripping cases where dexpreopt will not embed the dex file in the APK. bug: 63920015 Test: m Test: verify priv-apps dexs are uncompressed and unstripped Test: Verify a non priv-app APK with uncompressed dex doesn't get stripped. Change-Id: I624a03e3d965cebc0cae43fd6f7a6260178e6b8a
2018-01-09 12:46:30 +01:00
ifeq (true, $(LOCAL_UNCOMPRESS_DEX))
Add a product variable for priv-apps dependencies. Those dependencies are jars/apks on which we want to uncompress their dexs. bug: 30972906 bug: 63920015 Test: sailfish build Change-Id: Ic96ffe9dbe39abc1c28e7de134892d689207c9ca
2017-09-19 14:10:31 +02:00
$(uncompress-dexs)
$(align-package)
Tighter control of stripping in dex_preopt_odex_install. - Move logic to uncompress dexs in an APK in dex_preopt_odex_install.mk and definitions.mk. - Explicitly mark nostripping cases where dexpreopt will not embed the dex file in the APK. bug: 63920015 Test: m Test: verify priv-apps dexs are uncompressed and unstripped Test: Verify a non priv-app APK with uncompressed dex doesn't get stripped. Change-Id: I624a03e3d965cebc0cae43fd6f7a6260178e6b8a
2018-01-09 12:46:30 +01:00
endif # LOCAL_UNCOMPRESS_DEX
Revert "Revert "Add Turbine as part of java build toolchain in Make."" This reverts commit 33dcd0c5ebd2a8d8022bfd4ed31ae674d4cfe77e. Reason for revert: <stub.jar.toc needs classes.jar.toc which is no longer existed after Turbine was introduced. So use classes.jar to represent stub.jar.toc> Bug: b/64308460 Test: m clean && time m -j32 ANDROID_COMPILE_WITH_JACK=true Change-Id: If618993f1e0c789d93cc15664212603f994fd460
2017-08-31 23:43:04 +02:00
.KATI_RESTAT: $(common_javalib.jar)
Integrate dexpreopt into the build system. Change-Id: Id67f85d0f5c8674f5bc22e431114ca73625811ef
2010-09-18 01:36:06 +02:00
new LOCAL_DEX_PREOPT option "nostripping" Set "LOCAL_DEX_PREOPT := nostripping" to do dex-preopt while not strip the classes.dex. Bug: 5396625 5502338 Change-Id: Ie8dea4414ebeefeae89c6433b246faea27baa5e7
2011-10-24 21:17:03 +02:00
ifdef LOCAL_DEX_PREOPT
Integrate dexpreopt into the build system. Change-Id: Id67f85d0f5c8674f5bc22e431114ca73625811ef
2010-09-18 01:36:06 +02:00
Move dexpreopting to Soong Move the dexpreopting logic into Soong. Make modules will be dexpreopted by executing the Soong logic in the standalone dexpreopt_gen binary, which will generate scripts that will perform dexpreopting for each module. Export global configuration as JSON to $OUT/dexpreopt.config, which will be used by dexpreopt_gen and Soong, and per-module JSON configuration that will be used by dexpreopt_gen. This relands I59b20c931ee3e5a8d35eb30da4148691c5095502, I39d580999947ee54cfefe875b57a028be5333bd7, Ie7daa94e107d53eff075ca58dbe721bd9d7fc8c2 and Ica006a007d112c232311435aaac0c0e476232b67, with a minor update to match the changes made to dexpreopt_gen arguments and a fix to correctly keep dexpreopt disabled on mac builds. Bug: 119412419 Bug: 120273280 Test: no differences to dexpreopt outputs on aosp_sailfish system/, only expected changes to dexpreopt outputs on system_other (.vdex files for privileged Soong modules no longer incorrectly contain .dex contents). Change-Id: I25163e91886cea6941afa25cdb529ed053278dcb
2018-11-17 06:26:33 +01:00
$(LOCAL_BUILT_MODULE): PRIVATE_STRIP_SCRIPT := $(intermediates)/strip.sh
$(LOCAL_BUILT_MODULE): $(intermediates)/strip.sh
Separate dexpreopt deps from stripping deps The strip rule does not need to wait for the boot image to finish, create a separate DEXPREOPT_STRIP_DEPS list that only contains tools used by GenerateStripRule in build/soong/dexpreopt/dexpreopt.go. Bug: 123038675 Test: m checkbuild Change-Id: I0814c8d99781533f5778e14547d3e9671e06317f
2019-01-18 01:22:04 +01:00
$(LOCAL_BUILT_MODULE): | $(DEXPREOPT_STRIP_DEPS)
Move dexpreopting to Soong Move the dexpreopting logic into Soong. Make modules will be dexpreopted by executing the Soong logic in the standalone dexpreopt_gen binary, which will generate scripts that will perform dexpreopting for each module. Export global configuration as JSON to $OUT/dexpreopt.config, which will be used by dexpreopt_gen and Soong, and per-module JSON configuration that will be used by dexpreopt_gen. This relands I59b20c931ee3e5a8d35eb30da4148691c5095502, I39d580999947ee54cfefe875b57a028be5333bd7, Ie7daa94e107d53eff075ca58dbe721bd9d7fc8c2 and Ica006a007d112c232311435aaac0c0e476232b67, with a minor update to match the changes made to dexpreopt_gen arguments and a fix to correctly keep dexpreopt disabled on mac builds. Bug: 119412419 Bug: 120273280 Test: no differences to dexpreopt outputs on aosp_sailfish system/, only expected changes to dexpreopt outputs on system_other (.vdex files for privileged Soong modules no longer incorrectly contain .dex contents). Change-Id: I25163e91886cea6941afa25cdb529ed053278dcb
2018-11-17 06:26:33 +01:00
$(LOCAL_BUILT_MODULE): .KATI_DEPFILE := $(LOCAL_BUILT_MODULE).d
$(LOCAL_BUILT_MODULE): $(common_javalib.jar)
$(PRIVATE_STRIP_SCRIPT) $< $@
Integrate dexpreopt into the build system. Change-Id: Id67f85d0f5c8674f5bc22e431114ca73625811ef
2010-09-18 01:36:06 +02:00
else # LOCAL_DEX_PREOPT
Rearrange java library outputs Jack can silently handle using a java library as a static java library by merging in the java library dex file. This causes problems when switching to javac, because dex doesn't support dex merging with multidex enabled? Make the output files consistent between java libraries and static java libraries. Java libraries will now produce: classes-pre-proguard.jar: the classes before proguard processing classes.jar: the final jar file containing classes before dexing javalib.jar: a jar containing classes.dex Static java libraries will eventually only produce classes-pre-proguard.jar and classes.jar. All inter-library linking is done with classes.jar, so a java library can be used as a static java library. There are too many dependencies outside the build system that expect javalib.jar to exist for static and host java libraries, so for now continue to build a javalib.jar that is a copy of classes.jar. Test: m -j ANDROID_COMPILE_WITH_JACK=false java Test: m -j java Bug: 36901093 Change-Id: I6730e2d3ec38004874265b2a690442dec57b33f4
2017-03-29 22:53:29 +02:00
$(eval $(call copy-one-file,$(common_javalib.jar),$(LOCAL_BUILT_MODULE)))
auto import from //depot/cupcake/@135843
2009-03-04 04:28:42 +01:00
Move odex related files to product-specific dir. For target Java libraries, now the LOCAL_BUILT_MODULE includes both javalib.jar and the .odex file, if dexpreopt is enabled. These 2 files are moved to a product-specific dir in this change. For target Java Libraries, $(intermediates) now points to the product-specific dir. There is still a javalib.jar in the $(intermediates.COMMON) dir, which is used as dependency. Nothing is changed for host Java libraries. Change-Id: I2546dbb940c74537864ca002d1acb49bb731fbbc
2010-09-25 03:09:04 +02:00
endif # LOCAL_DEX_PREOPT
auto import from //depot/cupcake/@135843
2009-03-04 04:28:42 +01:00
endif # !LOCAL_IS_STATIC_JAVA_LIBRARY
Reference in a new issue Copy permalink