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

551 lines
23 KiB
Makefile
Raw Normal View History

Move Java stuff out of base_rules.mk - Moved the target-only .aidl and .logtag rules to java.mk. - Moved the .proto rules, Java library dependency calculation, Java resource processing and Java-related target-specific and global variables setup to a new java_common.java, which is shared by both target and host Java modules. - Minor cleanup for the moved code. Bug: 23597357 Change-Id: Ic3eb72e26bb1a663e5739abe0a935f96b88bc352
2015-08-28 20:47:03 +02:00
# Target Java.
auto import from //depot/cupcake/@135843
2009-03-04 04:28:42 +01:00
# Requires:
# LOCAL_MODULE_SUFFIX
# LOCAL_MODULE_CLASS
# all_res_assets
LOCAL_NO_STANDARD_LIBRARIES:=$(strip $(LOCAL_NO_STANDARD_LIBRARIES))
LOCAL_SDK_VERSION:=$(strip $(LOCAL_SDK_VERSION))
Integrate protocol buffer compiler into the build system. Bug: 3152546 Change-Id: Ida3ca3d633ce45704dc8e80d044cdbd3ca69aca5
2010-11-03 02:43:16 +01:00
proto_sources := $(filter %.proto,$(LOCAL_SRC_FILES))
ifneq ($(proto_sources),)
ifeq ($(LOCAL_PROTOC_OPTIMIZE_TYPE),micro)
Pull in latest protolib when using LOCAL_PROTOC_OPTIMIZE_TYPE. If a module is explicitly depending on a versioned protolib, we strip the dependency and log a warning so the unneeded dependency can be removed. Change-Id: I949d32fb5126f1c05e2a6ed48f6636a4a9b15a48
2014-09-16 02:51:11 +02:00
LOCAL_STATIC_JAVA_LIBRARIES += libprotobuf-java-micro
Integrate protocol buffer compiler into the build system. Bug: 3152546 Change-Id: Ida3ca3d633ce45704dc8e80d044cdbd3ca69aca5
2010-11-03 02:43:16 +01:00
else
Add a "nano" option to LOCAL_PROTOC_OPTIMIZE_TYPE. Change-Id: I7429015b3c5f7f38b7be01eb2d4927f7a9999c80
2013-03-28 22:02:14 +01:00
ifeq ($(LOCAL_PROTOC_OPTIMIZE_TYPE),nano)
Pull in latest protolib when using LOCAL_PROTOC_OPTIMIZE_TYPE. If a module is explicitly depending on a versioned protolib, we strip the dependency and log a warning so the unneeded dependency can be removed. Change-Id: I949d32fb5126f1c05e2a6ed48f6636a4a9b15a48
2014-09-16 02:51:11 +02:00
LOCAL_STATIC_JAVA_LIBRARIES += libprotobuf-java-nano
Add a "nano" option to LOCAL_PROTOC_OPTIMIZE_TYPE. Change-Id: I7429015b3c5f7f38b7be01eb2d4927f7a9999c80
2013-03-28 22:02:14 +01:00
else
Add streaming proto option to the build system. Test: make w/ other prereq changes Change-Id: Ie8711878e244074a9a3c128467eeb4908c2ef008
2016-10-06 03:01:10 +02:00
ifeq ($(LOCAL_PROTOC_OPTIMIZE_TYPE),stream)
# No library for stream protobufs
else
LOCAL_STATIC_JAVA_LIBRARIES += libprotobuf-java-lite
endif
Add a "nano" option to LOCAL_PROTOC_OPTIMIZE_TYPE. Change-Id: I7429015b3c5f7f38b7be01eb2d4927f7a9999c80
2013-03-28 22:02:14 +01:00
endif
Integrate protocol buffer compiler into the build system. Bug: 3152546 Change-Id: Ida3ca3d633ce45704dc8e80d044cdbd3ca69aca5
2010-11-03 02:43:16 +01:00
endif
endif
AAPT2: library resource compilation - Switch to static library's package-res.apk as the link artifact. - For prebuilt AAR file, build package-res.apk using aapt2's "--dir" option. - New LOCAL variables: LOCAL_USE_AAPT2: a module can opt-in with "LOCAL_USE_AAPT2 := true". LOCAL_STATIC_ANDROID_LIBRARIES: static Java libraries with compiled resources. LOCAL_SHARED_ANDROID_LIBRARIES: shared Java libraries with compiled resources. Bug: 25958912 Change-Id: I4be2d1e8137555986338c2583cb39b0c97391751
2016-02-24 23:11:55 +01:00
# LOCAL_STATIC_JAVA_AAR_LIBRARIES and LOCAL_STATIC_ANDROID_LIBRARIES are also LOCAL_STATIC_JAVA_LIBRARIES.
LOCAL_STATIC_JAVA_LIBRARIES := $(strip $(LOCAL_STATIC_JAVA_LIBRARIES) \
$(LOCAL_STATIC_JAVA_AAR_LIBRARIES) \
$(LOCAL_STATIC_ANDROID_LIBRARIES))
# LOCAL_SHARED_ANDROID_LIBRARIES are also LOCAL_JAVA_LIBRARIES.
LOCAL_JAVA_LIBRARIES := $(sort $(LOCAL_JAVA_LIBRARIES) $(LOCAL_SHARED_ANDROID_LIBRARIES))
auto import from //depot/cupcake/@135843
2009-03-04 04:28:42 +01:00
LOCAL_BUILT_MODULE_STEM := $(strip $(LOCAL_BUILT_MODULE_STEM))
ifeq ($(LOCAL_BUILT_MODULE_STEM),)
$(error $(LOCAL_PATH): Target java template must define LOCAL_BUILT_MODULE_STEM)
endif
ifneq ($(filter classes-compiled.jar classes.jar,$(LOCAL_BUILT_MODULE_STEM)),)
$(error LOCAL_BUILT_MODULE_STEM may not be "$(LOCAL_BUILT_MODULE_STEM)")
endif
Speed up the full build. Now, by default, instead of fully building everything, we skip dexing the modules that aren't going to be included in the current build. This will slow down some of the incremental builds (like tests), but it improves the regular eng build from 27.5 minutes on my Mac Pro to 25 minutes. That's not as much of an improvement as I had hoped for, but it's still better. There is also a change in here that puts the java-source-list file which is used to get around limited command line lengths in the proper directory. Before this change, it was an accident that the directory for that file existed!
2009-07-17 21:33:40 +02:00
##############################################################################
# Define the intermediate targets before including base_rules so they get
# the correct environment.
##############################################################################
intermediates := $(call local-intermediates-dir)
intermediates.COMMON := $(call local-intermediates-dir,COMMON)
Fix dependency when switching between build variants with and without Proguard. With this change, in a user build the dependency looks like: package.apk -> progaurd.classes.dex -> ... -> proguard.classes.jar While in an eng build: package.apk -> noproguard.classes.dex -> ... -> noproguard.classes.jar Because package.apk is product-specific and removed when switching between user and eng builds, it can always be built with the correct and up-to-date .dex file. Bug: 3022484 Change-Id: I3a732cb3e256f193088c294dc4a0573188283cb2
2010-09-23 20:48:38 +02:00
ifeq ($(LOCAL_PROGUARD_ENABLED),disabled)
LOCAL_PROGUARD_ENABLED :=
Speed up the full build. Now, by default, instead of fully building everything, we skip dexing the modules that aren't going to be included in the current build. This will slow down some of the incremental builds (like tests), but it improves the regular eng build from 27.5 minutes on my Mac Pro to 25 minutes. That's not as much of an improvement as I had hoped for, but it's still better. There is also a change in here that puts the java-source-list file which is used to get around limited command line lengths in the proper directory. Before this change, it was an accident that the directory for that file existed!
2009-07-17 21:33:40 +02:00
endif
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
full_classes_turbine_jar := $(intermediates.COMMON)/classes-turbine.jar
full_classes_header_jarjar := $(intermediates.COMMON)/classes-header-jarjar.jar
full_classes_header_jar := $(intermediates.COMMON)/classes-header.jar
Remove obsolete leaf names classes-no-debug-var.jar is incorrect, jars in coverage builds do have debug information. Remove full_classes_compiled_jar_leaf and hardcode classes-full-debug.jar. After the previous patch, all dex files have debug information, so remove the no-local and with-local directories and replace them with dex/. Remove the unnecessary jarjar_leaf. Bug: 70886092 Test: m checkbuild Change-Id: I63eace8f8cda5ad8bc0cbd11eefda73dd063ed76
2017-12-21 02:33:01 +01:00
full_classes_compiled_jar := $(intermediates.COMMON)/classes-full-debug.jar
Add LOCAL_JAR_PROCESSOR Allow using a host java library as an intermediate processor step after javac but before desugar, proguard, or dx. Test: manual Change-Id: I7fb843e10d96c0167f6e4371582fabcc1454521f
2017-05-23 01:21:49 +02:00
full_classes_processed_jar := $(intermediates.COMMON)/classes-processed.jar
Remove obsolete leaf names classes-no-debug-var.jar is incorrect, jars in coverage builds do have debug information. Remove full_classes_compiled_jar_leaf and hardcode classes-full-debug.jar. After the previous patch, all dex files have debug information, so remove the no-local and with-local directories and replace them with dex/. Remove the unnecessary jarjar_leaf. Bug: 70886092 Test: m checkbuild Change-Id: I63eace8f8cda5ad8bc0cbd11eefda73dd063ed76
2017-12-21 02:33:01 +01:00
full_classes_jarjar_jar := $(intermediates.COMMON)/classes-jarjar.jar
Use merge_zips to merge jars during Java build in Make. 1. Use merge_zips to merge jars without unzipping/rezipping static Java libraries. And seperate merging process as a independent Make target so that Javac can only depend on Turbine. 2. Remove duplicate vars: "full_java_lib_deps" in droiddoc.mk 3. Also use classes-header.jar for link_apk & link_instr Bug: b/65455145 Test: m clean && m -j32 Change-Id: I7b0307664a6b86075c983284fce099bd3946318c
2017-09-13 22:13:53 +02:00
full_classes_combined_jar := $(intermediates.COMMON)/classes-combined.jar
Remove obsolete leaf names classes-no-debug-var.jar is incorrect, jars in coverage builds do have debug information. Remove full_classes_compiled_jar_leaf and hardcode classes-full-debug.jar. After the previous patch, all dex files have debug information, so remove the no-local and with-local directories and replace them with dex/. Remove the unnecessary jarjar_leaf. Bug: 70886092 Test: m checkbuild Change-Id: I63eace8f8cda5ad8bc0cbd11eefda73dd063ed76
2017-12-21 02:33:01 +01:00
built_dex_intermediate := $(intermediates.COMMON)/dex/classes.dex
Fix dependency when switching between build variants with and without Proguard. With this change, in a user build the dependency looks like: package.apk -> progaurd.classes.dex -> ... -> proguard.classes.jar While in an eng build: package.apk -> noproguard.classes.dex -> ... -> noproguard.classes.jar Because package.apk is product-specific and removed when switching between user and eng builds, it can always be built with the correct and up-to-date .dex file. Bug: 3022484 Change-Id: I3a732cb3e256f193088c294dc4a0573188283cb2
2010-09-23 20:48:38 +02:00
full_classes_stubs_jar := $(intermediates.COMMON)/stubs.jar
Separate java source list generation into its own rule Move the java source list generation step into its own rule. This has a couple of advantages. It consolidates the source list generation so that it only has to run once for javac, jack, and jack-check. It also massively reduces the length of the javac command line, so that error messages are significantly shorter, and allows easily rerunning the failing build command because the file list is still on disk. The primary disadvantage is that javac error messages no longer include the list of files passed to javac, but the list is available earlier in the build long when the file list was written, and is still available on disk. Test: m -j javac-check Change-Id: I9730b352b33a060e08221b61c11c617d23320d67
2017-05-27 00:22:02 +02:00
java_source_list_file := $(intermediates.COMMON)/java-source-list
Fix dependency when switching between build variants with and without Proguard. With this change, in a user build the dependency looks like: package.apk -> progaurd.classes.dex -> ... -> proguard.classes.jar While in an eng build: package.apk -> noproguard.classes.dex -> ... -> noproguard.classes.jar Because package.apk is product-specific and removed when switching between user and eng builds, it can always be built with the correct and up-to-date .dex file. Bug: 3022484 Change-Id: I3a732cb3e256f193088c294dc4a0573188283cb2
2010-09-23 20:48:38 +02:00
Skip compiling Java if an apk has no Java code. Change-Id: Iee204e03ad5bc8ce5c3b4b3863c19c89184826e2
2013-08-29 02:28:36 +02:00
ifeq ($(LOCAL_MODULE_CLASS)$(LOCAL_SRC_FILES)$(LOCAL_STATIC_JAVA_LIBRARIES)$(LOCAL_SOURCE_FILES_ALL_GENERATED),APPS)
# If this is an apk without any Java code (e.g. framework-res), we should skip compiling Java.
Better handle of need_compile_java. Change-Id: I609a27e2b35b08962243b6516c6c525c0c938d3c
2013-08-28 22:04:46 +02:00
full_classes_jar :=
built_dex :=
else
Fix dependency when switching between build variants with and without Proguard. With this change, in a user build the dependency looks like: package.apk -> progaurd.classes.dex -> ... -> proguard.classes.jar While in an eng build: package.apk -> noproguard.classes.dex -> ... -> noproguard.classes.jar Because package.apk is product-specific and removed when switching between user and eng builds, it can always be built with the correct and up-to-date .dex file. Bug: 3022484 Change-Id: I3a732cb3e256f193088c294dc4a0573188283cb2
2010-09-23 20:48:38 +02:00
full_classes_jar := $(intermediates.COMMON)/classes.jar
Drop the [no]proguard. prefix for the intermediate targets Since we have enabled Progaurd for all build variants, we don't need the different naming scheme along the path to make incremental build work properly when you switch build variant. As a result, this fixes the nothing-to-do-do-build-gets-something-build bug introduced by the multi-dex change. Change-Id: I907ff13091013d28910b0aa190b9218144385132
2013-09-13 02:35:21 +02:00
built_dex := $(intermediates.COMMON)/classes.dex
Better handle of need_compile_java. Change-Id: I609a27e2b35b08962243b6516c6c525c0c938d3c
2013-08-28 22:04:46 +02:00
endif
Speed up the full build. Now, by default, instead of fully building everything, we skip dexing the modules that aren't going to be included in the current build. This will slow down some of the incremental builds (like tests), but it improves the regular eng build from 27.5 minutes on my Mac Pro to 25 minutes. That's not as much of an improvement as I had hoped for, but it's still better. There is also a change in here that puts the java-source-list file which is used to get around limited command line lengths in the proper directory. Before this change, it was an accident that the directory for that file existed!
2009-07-17 21:33:40 +02:00
LOCAL_INTERMEDIATE_TARGETS += \
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
$(full_classes_turbine_jar) \
Speed up the full build. Now, by default, instead of fully building everything, we skip dexing the modules that aren't going to be included in the current build. This will slow down some of the incremental builds (like tests), but it improves the regular eng build from 27.5 minutes on my Mac Pro to 25 minutes. That's not as much of an improvement as I had hoped for, but it's still better. There is also a change in here that puts the java-source-list file which is used to get around limited command line lengths in the proper directory. Before this change, it was an accident that the directory for that file existed!
2009-07-17 21:33:40 +02:00
$(full_classes_compiled_jar) \
Fix dependency when switching between build variants with and without Proguard. With this change, in a user build the dependency looks like: package.apk -> progaurd.classes.dex -> ... -> proguard.classes.jar While in an eng build: package.apk -> noproguard.classes.dex -> ... -> noproguard.classes.jar Because package.apk is product-specific and removed when switching between user and eng builds, it can always be built with the correct and up-to-date .dex file. Bug: 3022484 Change-Id: I3a732cb3e256f193088c294dc4a0573188283cb2
2010-09-23 20:48:38 +02:00
$(full_classes_jarjar_jar) \
$(full_classes_jar) \
Use merge_zips to merge jars during Java build in Make. 1. Use merge_zips to merge jars without unzipping/rezipping static Java libraries. And seperate merging process as a independent Make target so that Javac can only depend on Turbine. 2. Remove duplicate vars: "full_java_lib_deps" in droiddoc.mk 3. Also use classes-header.jar for link_apk & link_instr Bug: b/65455145 Test: m clean && m -j32 Change-Id: I7b0307664a6b86075c983284fce099bd3946318c
2017-09-13 22:13:53 +02:00
$(full_classes_combined_jar) \
Fix dependency when switching between build variants with and without Proguard. With this change, in a user build the dependency looks like: package.apk -> progaurd.classes.dex -> ... -> proguard.classes.jar While in an eng build: package.apk -> noproguard.classes.dex -> ... -> noproguard.classes.jar Because package.apk is product-specific and removed when switching between user and eng builds, it can always be built with the correct and up-to-date .dex file. Bug: 3022484 Change-Id: I3a732cb3e256f193088c294dc4a0573188283cb2
2010-09-23 20:48:38 +02:00
$(built_dex_intermediate) \
enhancement for building app with emma code coverage * global filter to avoid applying instrumentation on emma classes * remove local variable information at dex step instead of compile time Change-Id: If04c27bc717f34816077a98ead9ceb0dbcbb0d2f
2010-03-11 00:48:03 +01:00
$(built_dex) \
Separate java source list generation into its own rule Move the java source list generation step into its own rule. This has a couple of advantages. It consolidates the source list generation so that it only has to run once for javac, jack, and jack-check. It also massively reduces the length of the javac command line, so that error messages are significantly shorter, and allows easily rerunning the failing build command because the file list is still on disk. The primary disadvantage is that javac error messages no longer include the list of files passed to javac, but the list is available earlier in the build long when the file list was written, and is still available on disk. Test: m -j javac-check Change-Id: I9730b352b33a060e08221b61c11c617d23320d67
2017-05-27 00:22:02 +02:00
$(full_classes_stubs_jar) \
$(java_source_list_file)
Fix dependency when switching between build variants with and without Proguard. With this change, in a user build the dependency looks like: package.apk -> progaurd.classes.dex -> ... -> proguard.classes.jar While in an eng build: package.apk -> noproguard.classes.dex -> ... -> noproguard.classes.jar Because package.apk is product-specific and removed when switching between user and eng builds, it can always be built with the correct and up-to-date .dex file. Bug: 3022484 Change-Id: I3a732cb3e256f193088c294dc4a0573188283cb2
2010-09-23 20:48:38 +02:00
Add a rule that builds an eclipse project file for an app. Type make ECLIPSE-<app1>-<app2>... with the apps as listed in LOCAL_PACKAGE_NAME. Change-Id: Ieb96dfc9dfc13bdf1b3be53572092fc7bc695869
2010-05-18 03:16:11 +02:00
LOCAL_INTERMEDIATE_SOURCE_DIR := $(intermediates.COMMON)/src
Speed up the full build. Now, by default, instead of fully building everything, we skip dexing the modules that aren't going to be included in the current build. This will slow down some of the incremental builds (like tests), but it improves the regular eng build from 27.5 minutes on my Mac Pro to 25 minutes. That's not as much of an improvement as I had hoped for, but it's still better. There is also a change in here that puts the java-source-list file which is used to get around limited command line lengths in the proper directory. Before this change, it was an accident that the directory for that file existed!
2009-07-17 21:33:40 +02:00
Move Java stuff out of base_rules.mk - Moved the target-only .aidl and .logtag rules to java.mk. - Moved the .proto rules, Java library dependency calculation, Java resource processing and Java-related target-specific and global variables setup to a new java_common.java, which is shared by both target and host Java modules. - Minor cleanup for the moved code. Bug: 23597357 Change-Id: Ic3eb72e26bb1a663e5739abe0a935f96b88bc352
2015-08-28 20:47:03 +02:00
###########################################################
## AIDL: Compile .aidl files to .java
###########################################################
aidl_sources := $(filter %.aidl,$(LOCAL_SRC_FILES))
Fix path escaping for aidl generated java Bug: 29619260 Change-Id: I806044573661c61e691adf36a47092188db87ab6 Test: Generated java with ../ in paths appears in the right place.
2016-06-24 01:44:47 +02:00
aidl_java_sources :=
Move Java stuff out of base_rules.mk - Moved the target-only .aidl and .logtag rules to java.mk. - Moved the .proto rules, Java library dependency calculation, Java resource processing and Java-related target-specific and global variables setup to a new java_common.java, which is shared by both target and host Java modules. - Minor cleanup for the moved code. Bug: 23597357 Change-Id: Ic3eb72e26bb1a663e5739abe0a935f96b88bc352
2015-08-28 20:47:03 +02:00
ifneq ($(strip $(aidl_sources)),)
aidl_preprocess_import :=
ifdef LOCAL_SDK_VERSION
Introduce TARGET_BUILD_UNBUNDLED_IMAGE - TARGET_BUILD_UNBUNDLED_IMAGE is similar to TARGET_BUILD_APPS, but its targets are the unbundled partitions instead of apps. - Rename TARGET_BUILD_APPS_USE_PREBUILT_SDK to TARGET_BUILD_USE_PREBUILT_SDKS because it is used even without TARGET_BUILD_APPS. -Instead of TARGET_BUILD_APPS, use TARGET_BUILD_USE_PREBUILT_SDKS to build java modules with prebuilt sdks, and propagate to Soong. Bug: 160390776 Test: TARGET_BUILD_UNBUNDLED_IMAGE=true m vendorimage Change-Id: Ie096212ccbcca0018baae55e106af693b002c9e5
2020-07-08 11:10:38 +02:00
ifneq ($(filter current system_current test_current core_current, $(LOCAL_SDK_VERSION)$(TARGET_BUILD_USE_PREBUILT_SDKS)),)
# LOCAL_SDK_VERSION is current and no TARGET_BUILD_USE_PREBUILT_SDKS
Use framework.aidl built by Soong Bug: 130798034 Test: m checkbuild Change-Id: I24621b41860ce1fd1c3ba067430c8d62b49d03cb
2019-04-18 21:06:27 +02:00
aidl_preprocess_import := $(FRAMEWORK_AIDL)
Move Java stuff out of base_rules.mk - Moved the target-only .aidl and .logtag rules to java.mk. - Moved the .proto rules, Java library dependency calculation, Java resource processing and Java-related target-specific and global variables setup to a new java_common.java, which is shared by both target and host Java modules. - Minor cleanup for the moved code. Bug: 23597357 Change-Id: Ic3eb72e26bb1a663e5739abe0a935f96b88bc352
2015-08-28 20:47:03 +02:00
else
Update make rules to use new android.jar location. This file has been copied into a 'public' subdir. Use that, so that the old file can be deleted. Also introduce a new macro to avoid duplicating this path in a bunch of places. Bug: 77525052 Test: m checkbuild Change-Id: Ifcf59c6fb357769b2765e417c8dd56d2ad9b97aa
2018-04-27 15:11:17 +02:00
aidl_preprocess_import := $(call resolve-prebuilt-sdk-aidl-path,$(LOCAL_SDK_VERSION))
Move Java stuff out of base_rules.mk - Moved the target-only .aidl and .logtag rules to java.mk. - Moved the .proto rules, Java library dependency calculation, Java resource processing and Java-related target-specific and global variables setup to a new java_common.java, which is shared by both target and host Java modules. - Minor cleanup for the moved code. Bug: 23597357 Change-Id: Ic3eb72e26bb1a663e5739abe0a935f96b88bc352
2015-08-28 20:47:03 +02:00
endif # not current or system_current
else
# build against the platform.
LOCAL_AIDL_INCLUDES += $(FRAMEWORKS_BASE_JAVA_SRC_DIRS)
endif # LOCAL_SDK_VERSION
Fix path escaping for aidl generated java Bug: 29619260 Change-Id: I806044573661c61e691adf36a47092188db87ab6 Test: Generated java with ../ in paths appears in the right place.
2016-06-24 01:44:47 +02:00
$(foreach s,$(aidl_sources),\
Move generated aidl/logtags java classes to a subfolder So that they can't be generated into src/, which would be added to the source list automatically. Bug: 36698184 Test: m telephony-common without this change, pass Test: m telephony-common without the cleanspec, fail with dup class Test: m telephony-common with the cleanspec, pass Change-Id: I7b2fc1847d52ff4a9ba8c69e76123fe152629ef8
2017-09-30 02:37:31 +02:00
$(eval $(call define-aidl-java-rule,$(s),$(intermediates.COMMON)/aidl,aidl_java_sources)))
Use .KATI_DEPFILE for files generated by aidl-java Bug: 26839129 Change-Id: Ief611969b28aea3bb12097ba91d40f3e5010d647
2016-01-28 08:10:00 +01:00
$(foreach java,$(aidl_java_sources), \
$(call include-depfile,$(java:%.java=%.P),$(java)))
Move Java stuff out of base_rules.mk - Moved the target-only .aidl and .logtag rules to java.mk. - Moved the .proto rules, Java library dependency calculation, Java resource processing and Java-related target-specific and global variables setup to a new java_common.java, which is shared by both target and host Java modules. - Minor cleanup for the moved code. Bug: 23597357 Change-Id: Ic3eb72e26bb1a663e5739abe0a935f96b88bc352
2015-08-28 20:47:03 +02:00
Fix path escaping for aidl generated java Bug: 29619260 Change-Id: I806044573661c61e691adf36a47092188db87ab6 Test: Generated java with ../ in paths appears in the right place.
2016-06-24 01:44:47 +02:00
$(aidl_java_sources) : $(LOCAL_ADDITIONAL_DEPENDENCIES) $(aidl_preprocess_import)
Remove '-b' from AIDL. An empty file will be emitted for parcel declarations. Now sources may include parcel definitions. Bug: 70046217 Test: manual Change-Id: Ib4bfaf52101956a543738d50ea699f9232f5bb91
2019-02-06 02:01:48 +01:00
$(aidl_java_sources): PRIVATE_AIDL_FLAGS := $(addprefix -p,$(aidl_preprocess_import)) -I$(LOCAL_PATH) -I$(LOCAL_PATH)/src $(addprefix -I,$(LOCAL_AIDL_INCLUDES))
Fix typo in setting PRIVATE_MODULE for AIDL source Bug: 29619260 Change-Id: I59f883c1a92075800844cc2a77b307782a9ab800
2016-06-24 22:13:52 +02:00
$(aidl_java_sources): PRIVATE_MODULE := $(LOCAL_MODULE)
Fix path escaping for aidl generated java Bug: 29619260 Change-Id: I806044573661c61e691adf36a47092188db87ab6 Test: Generated java with ../ in paths appears in the right place.
2016-06-24 01:44:47 +02:00
Move Java stuff out of base_rules.mk - Moved the target-only .aidl and .logtag rules to java.mk. - Moved the .proto rules, Java library dependency calculation, Java resource processing and Java-related target-specific and global variables setup to a new java_common.java, which is shared by both target and host Java modules. - Minor cleanup for the moved code. Bug: 23597357 Change-Id: Ic3eb72e26bb1a663e5739abe0a935f96b88bc352
2015-08-28 20:47:03 +02:00
endif
##########################################
Refactor calculation LOCAL_CHECKED_MODULE To remove dup code; Also added two more umbrella targets: host, target. Change-Id: Ia6deed2940a26a31ad823fe54816840861f3fb72
2013-01-30 20:22:06 +01:00
# All of the rules after full_classes_compiled_jar are very unlikely
# to fail except for bugs in their respective tools. If you would
# like to run these rules, add the "all" modifier goal to the make
# command line.
Clean up Javac a little bit. - Added GLOBAL_JAVAC_DEBUG_FLAGS and merge it to PRIVATE_JAVACFLAGS/PRIVATE_JACK_FLAGS to get rid of PRIVATE_JAVAC_DEBUG_FLAGS/PRIVATE_JACK_DEBUG_FLAGS. - With Java rules out of base_rules.mk we can get rid of java_alternative_checked_module now. Change-Id: I1a14716c785e3d49330a75044107662ce96a9307
2015-09-02 04:12:05 +02:00
ifndef LOCAL_CHECKED_MODULE
Revert "Use Jack to check build" This reverts commit 8bc90fd2d6ccf70b65d2d3aad22b0453b86a262d. This CL also impacts standard targets. With Jack enabled, a global 'make' without that CL produce ~287 dex files, with this CL, it produces ~697 dex files. Bug: 19069325 Change-Id: I39853da0cba8226f31037733edc420507d76c8c0
2015-01-20 15:18:48 +01:00
ifdef full_classes_jar
Support LOCAL_JACK_ENABLED := javac_frontend Allow working around Jack bugs by using javac to compile *.java to class files, and then pass through Jack for desugaring, proguarding, and dexing. Also make ANDROID_COMPILE_WITH_JACK=false override LOCAL_JACK_ENABLED. Bug: 37483961 Test: m -j checkbuild Test: Add LOCAL_JACK_ENABLED := javac_frontend to a target Change-Id: I2189055aac9deccc36b8eab8e949796dddadf7a1
2017-04-27 22:34:02 +02:00
LOCAL_CHECKED_MODULE := $(full_classes_compiled_jar)
Better handle of need_compile_java. Change-Id: I609a27e2b35b08962243b6516c6c525c0c938d3c
2013-08-28 22:04:46 +02:00
endif
Use Jack to check build Run jack with no outputs as a quick check for compilation errors and use a timestamp to store that check was made. Bug: 19069325 (cherry picked from commit 43084d9f49a994a7eaebd3c94758d0ebf4c74b6e) Change-Id: I9b84b503b28cfdfa245f91da0061ee3a79386b28
2015-08-18 19:18:18 +02:00
endif
Refactor calculation LOCAL_CHECKED_MODULE To remove dup code; Also added two more umbrella targets: host, target. Change-Id: Ia6deed2940a26a31ad823fe54816840861f3fb72
2013-01-30 20:22:06 +01:00
auto import from //depot/cupcake/@135843
2009-03-04 04:28:42 +01:00
#######################################
include $(BUILD_SYSTEM)/base_rules.mk
#######################################
Move part of logtags stuff back to base_rules.mk. Otherwise event tags for non-Java modules (e.g. logcat, libsurfaceflinger) are not generated. BUG: 23803975 Change-Id: I6fd53fe2ca39102787fc513aa8c23f906b94f253
2015-09-04 09:23:49 +02:00
###########################################################
## logtags: emit java source
###########################################################
ifneq ($(strip $(logtags_sources)),)
Move generated aidl/logtags java classes to a subfolder So that they can't be generated into src/, which would be added to the source list automatically. Bug: 36698184 Test: m telephony-common without this change, pass Test: m telephony-common without the cleanspec, fail with dup class Test: m telephony-common with the cleanspec, pass Change-Id: I7b2fc1847d52ff4a9ba8c69e76123fe152629ef8
2017-09-30 02:37:31 +02:00
logtags_java_sources := $(patsubst %.logtags,%.java,$(addprefix $(intermediates.COMMON)/logtags/, $(logtags_sources)))
Move part of logtags stuff back to base_rules.mk. Otherwise event tags for non-Java modules (e.g. logcat, libsurfaceflinger) are not generated. BUG: 23803975 Change-Id: I6fd53fe2ca39102787fc513aa8c23f906b94f253
2015-09-04 09:23:49 +02:00
logtags_sources := $(addprefix $(LOCAL_PATH)/, $(logtags_sources))
Fix dependencies around tools/*-event-log-tags.py We should regenerate merged tag files and java sources when these scripts are updated. Change-Id: Id5f11d6f480f3f74dab08f01e929ee2d7fafd2d0
2016-03-28 20:29:21 +02:00
$(logtags_java_sources): PRIVATE_MERGED_TAG := $(TARGET_OUT_COMMON_INTERMEDIATES)/all-event-log-tags.txt
Replace build/tools with build/make/tools Test: m checkbuild Change-Id: I8db6c27a6d2372f142d10568fe92d6f2e9a59252
2017-12-06 23:38:40 +01:00
$(logtags_java_sources): $(intermediates.COMMON)/logtags/%.java: $(LOCAL_PATH)/%.logtags $(TARGET_OUT_COMMON_INTERMEDIATES)/all-event-log-tags.txt $(JAVATAGS) build/make/tools/event_log_tags.py
Move part of logtags stuff back to base_rules.mk. Otherwise event tags for non-Java modules (e.g. logcat, libsurfaceflinger) are not generated. BUG: 23803975 Change-Id: I6fd53fe2ca39102787fc513aa8c23f906b94f253
2015-09-04 09:23:49 +02:00
$(transform-logtags-to-java)
else
logtags_java_sources :=
endif
Move Java stuff out of base_rules.mk - Moved the target-only .aidl and .logtag rules to java.mk. - Moved the .proto rules, Java library dependency calculation, Java resource processing and Java-related target-specific and global variables setup to a new java_common.java, which is shared by both target and host Java modules. - Minor cleanup for the moved code. Bug: 23597357 Change-Id: Ic3eb72e26bb1a663e5739abe0a935f96b88bc352
2015-08-28 20:47:03 +02:00
##########################################
java_sources := $(addprefix $(LOCAL_PATH)/, $(filter %.java,$(LOCAL_SRC_FILES))) $(aidl_java_sources) $(logtags_java_sources) \
$(filter %.java,$(LOCAL_GENERATED_SOURCES))
Support java compilation sharding for target side. Add "LOCAL_JAVAC_SHARD_SIZE" to represent the number of java source path entries in each shard. Sharding is not allowed when "LOCAL_JAVAC_SHARD_SIZE" and "LOCAL_JAR_PROCESSORS" are both enabled. Limitation: 1. 0 <= LOCAL_JAVAC_SHARD_SIZE <= 8192 1. 0 < NUM(java_sources) <= 8192 2. 0 <= NUM(shards) <= 100 Performance Compare: <Unsharded Build------------------------------------------------> 1. Build from clean state rm -r -f out/target/common/obj/JAVA_LIBRARIES/framework_intermediates/ && time m out/target/common/obj/JAVA_LIBRARIES/framework_intermediates/classes-full-debug.jar real 1m2.720s user 5m26.604s sys 0m39.552s 2. Incremental build m out/target/common/obj/JAVA_LIBRARIES/framework_intermediates/classes-full-debug.jar && touch frameworks/base/core/java/android/net/http/HttpResponseCache.java && time m out/target/common/obj/JAVA_LIBRARIES/framework_intermediates/classes-full-debug.jar real 0m37.586s user 5m47.804s sys 0m50.388s <Sharded Build--------------------------------------------------> 1. Build from clean state rm -r -f out/target/common/obj/JAVA_LIBRARIES/framework_intermediates/ && time m out/target/common/obj/JAVA_LIBRARIES/framework_intermediates/classes-full-debug.jar Javac Shard Size: 50----real 1m10.163s user 25m59.008s sys 1m58.460s Javac Shard Size: 100---real 1m2.115s user 21m3.600s sys 1m15.964s Javac Shard Size: 150---real 0m59.520s user 18m10.544s sys 1m12.628s Javac Shard Size: 200---real 0m56.894s user 15m39.244s sys 1m11.608s Javac Shard Size: 250---real 0m55.991s user 14m38.716s sys 1m2.292s Javac Shard Size: 300---real 0m55.114s user 13m6.568s sys 1m8.200s Javac Shard Size: 350---real 0m53.144s user 12m7.740s sys 1m3.836s Javac Shard Size: 400---real 0m54.929s user 12m9.324s sys 1m4.340s Javac Shard Size: 450---real 1m30.194s user 25m31.468s sys 1m52.416s Javac Shard Size: 500---real 0m53.976s user 10m35.500s sys 0m55.160s 2. Incremental build m out/target/common/obj/JAVA_LIBRARIES/framework_intermediates/classes-full-debug.jar && touch frameworks/base/core/java/android/net/http/HttpResponseCache.java && time m out/target/common/obj/JAVA_LIBRARIES/framework_intermediates/classes-full-debug.jar Javac Shard Size: 50-----real 0m16.322s user 1m8.648s sys 0m31.700s Javac Shard Size: 100----real 0m16.163s user 1m22.932s sys 0m29.440s Javac Shard Size: 150----real 0m16.611s user 1m37.828s sys 0m21.168s Javac Shard Size: 200----real 0m16.936s user 1m49.248s sys 0m28.636s Javac Shard Size: 250----real 0m17.509s user 1m54.944s sys 0m32.768s Javac Shard Size: 300----real 0m18.868s user 1m54.088s sys 0m28.824s Javac Shard Size: 350----real 0m17.629s user 1m54.108s sys 0m31.056s Javac Shard Size: 400----real 0m18.658s user 2m7.712s sys 0m30.636s Javac Shard Size: 450----real 0m18.874s user 2m8.808s sys 0m33.540s Javac Shard Size: 500----real 0m19.432s user 2m24.400s sys 0m30.368s time m nothing: real 0m5.799s user 0m7.236s sys 0m3.068s Test: m clean && m -j checkbuild Bug: b/67424047 Change-Id: Id0766d2b7de7c4546d29bbc7f8a0dd0e4b9ad45b
2017-10-04 18:26:06 +02:00
java_intermediate_sources := $(addprefix $(TARGET_OUT_COMMON_INTERMEDIATES)/, $(filter %.java,$(LOCAL_INTERMEDIATE_SOURCES)))
all_java_sources := $(java_sources) $(java_intermediate_sources)
aidegen: Collect all java sources from makefile system. Bug: 117129969 Test: make -j64 out/target/product/generic_x86_64/module-info.json Change-Id: I4bc6cab8e56a1ed6485ad2f5f22fe9b8149b25d0
2018-10-05 08:55:36 +02:00
ALL_MODULES.$(my_register_name).SRCS := $(ALL_MODULES.$(my_register_name).SRCS) $(all_java_sources)
Support java compilation sharding for target side. Add "LOCAL_JAVAC_SHARD_SIZE" to represent the number of java source path entries in each shard. Sharding is not allowed when "LOCAL_JAVAC_SHARD_SIZE" and "LOCAL_JAR_PROCESSORS" are both enabled. Limitation: 1. 0 <= LOCAL_JAVAC_SHARD_SIZE <= 8192 1. 0 < NUM(java_sources) <= 8192 2. 0 <= NUM(shards) <= 100 Performance Compare: <Unsharded Build------------------------------------------------> 1. Build from clean state rm -r -f out/target/common/obj/JAVA_LIBRARIES/framework_intermediates/ && time m out/target/common/obj/JAVA_LIBRARIES/framework_intermediates/classes-full-debug.jar real 1m2.720s user 5m26.604s sys 0m39.552s 2. Incremental build m out/target/common/obj/JAVA_LIBRARIES/framework_intermediates/classes-full-debug.jar && touch frameworks/base/core/java/android/net/http/HttpResponseCache.java && time m out/target/common/obj/JAVA_LIBRARIES/framework_intermediates/classes-full-debug.jar real 0m37.586s user 5m47.804s sys 0m50.388s <Sharded Build--------------------------------------------------> 1. Build from clean state rm -r -f out/target/common/obj/JAVA_LIBRARIES/framework_intermediates/ && time m out/target/common/obj/JAVA_LIBRARIES/framework_intermediates/classes-full-debug.jar Javac Shard Size: 50----real 1m10.163s user 25m59.008s sys 1m58.460s Javac Shard Size: 100---real 1m2.115s user 21m3.600s sys 1m15.964s Javac Shard Size: 150---real 0m59.520s user 18m10.544s sys 1m12.628s Javac Shard Size: 200---real 0m56.894s user 15m39.244s sys 1m11.608s Javac Shard Size: 250---real 0m55.991s user 14m38.716s sys 1m2.292s Javac Shard Size: 300---real 0m55.114s user 13m6.568s sys 1m8.200s Javac Shard Size: 350---real 0m53.144s user 12m7.740s sys 1m3.836s Javac Shard Size: 400---real 0m54.929s user 12m9.324s sys 1m4.340s Javac Shard Size: 450---real 1m30.194s user 25m31.468s sys 1m52.416s Javac Shard Size: 500---real 0m53.976s user 10m35.500s sys 0m55.160s 2. Incremental build m out/target/common/obj/JAVA_LIBRARIES/framework_intermediates/classes-full-debug.jar && touch frameworks/base/core/java/android/net/http/HttpResponseCache.java && time m out/target/common/obj/JAVA_LIBRARIES/framework_intermediates/classes-full-debug.jar Javac Shard Size: 50-----real 0m16.322s user 1m8.648s sys 0m31.700s Javac Shard Size: 100----real 0m16.163s user 1m22.932s sys 0m29.440s Javac Shard Size: 150----real 0m16.611s user 1m37.828s sys 0m21.168s Javac Shard Size: 200----real 0m16.936s user 1m49.248s sys 0m28.636s Javac Shard Size: 250----real 0m17.509s user 1m54.944s sys 0m32.768s Javac Shard Size: 300----real 0m18.868s user 1m54.088s sys 0m28.824s Javac Shard Size: 350----real 0m17.629s user 1m54.108s sys 0m31.056s Javac Shard Size: 400----real 0m18.658s user 2m7.712s sys 0m30.636s Javac Shard Size: 450----real 0m18.874s user 2m8.808s sys 0m33.540s Javac Shard Size: 500----real 0m19.432s user 2m24.400s sys 0m30.368s time m nothing: real 0m5.799s user 0m7.236s sys 0m3.068s Test: m clean && m -j checkbuild Bug: b/67424047 Change-Id: Id0766d2b7de7c4546d29bbc7f8a0dd0e4b9ad45b
2017-10-04 18:26:06 +02:00
Move Java stuff out of base_rules.mk - Moved the target-only .aidl and .logtag rules to java.mk. - Moved the .proto rules, Java library dependency calculation, Java resource processing and Java-related target-specific and global variables setup to a new java_common.java, which is shared by both target and host Java modules. - Minor cleanup for the moved code. Bug: 23597357 Change-Id: Ic3eb72e26bb1a663e5739abe0a935f96b88bc352
2015-08-28 20:47:03 +02:00
include $(BUILD_SYSTEM)/java_common.mk
Add support for LOCAL_PRIVATE_PLATFORM_APIS. The only enforcement right now is that modules don't specify both LOCAL_SDK_VERSION and LOCAL_PRIVATE_PLATFORM_APIS, but a warning can be turned on by setting the JAVA_SDK_ENFORCEMENT_WARNING variable. Bug: 73535841 Test: make w/ and wo/ flag. Change-Id: I3cc720bf060e2bc789e10884ff888d527b91cb50
2018-02-21 16:29:44 +01:00
include $(BUILD_SYSTEM)/sdk_check.mk
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
# Set the profile source so that the odex / profile code included from java.mk
# can find it.
#
# TODO: b/64896089, this is broken when called from package_internal.mk, since the file
# we preopt from is a temporary file. This will be addressed in a follow up, possibly
# by disabling stripping for profile guided preopt (which may be desirable for other
# reasons anyway).
#
# Note that we set this only when called from package_internal.mk and not in other cases.
ifneq (,$(called_from_package_internal)
dex_preopt_profile_src_file := $(LOCAL_BUILT_MODULE)
endif
Add DEXPREOPT support for ART Change-Id: I24d0d7b2a23a769f5d69bd4dc14be22e1475b759
2013-11-15 08:44:56 +01:00
#######################################
# defines built_odex along with rule to install odex
Consolidate manifest_check for different module types. Move manifest_check (a.k.a. verify_uses_libraries check) from makefiles for specific module types to common makefile dex_preopt_odex_install.mk, which is included by all Java modules that may require dexpreopt. If a modules locally disables dexpreopt, it still goes through manifest_check (unless dexpreopt is globally disabled or the module has no Java code). This CL allows to have manifest_check and dexpreopt in the same makefile (which is needed for a follow-up CL that will reuse dexpreopt variables for manifest_check). Bug: 132357300 Test: lunch cf_x86_64_phone-userdebug && m Change-Id: Ia217cfc247ae43d8fc716bfc1fe9dcce1d00aa7f
2021-03-16 12:51:37 +01:00
my_manifest_or_apk := $(full_android_manifest)
Add DEXPREOPT support for ART Change-Id: I24d0d7b2a23a769f5d69bd4dc14be22e1475b759
2013-11-15 08:44:56 +01:00
include $(BUILD_SYSTEM)/dex_preopt_odex_install.mk
Consolidate manifest_check for different module types. Move manifest_check (a.k.a. verify_uses_libraries check) from makefiles for specific module types to common makefile dex_preopt_odex_install.mk, which is included by all Java modules that may require dexpreopt. If a modules locally disables dexpreopt, it still goes through manifest_check (unless dexpreopt is globally disabled or the module has no Java code). This CL allows to have manifest_check and dexpreopt in the same makefile (which is needed for a follow-up CL that will reuse dexpreopt variables for manifest_check). Bug: 132357300 Test: lunch cf_x86_64_phone-userdebug && m Change-Id: Ia217cfc247ae43d8fc716bfc1fe9dcce1d00aa7f
2021-03-16 12:51:37 +01:00
my_manifest_or_apk :=
Add DEXPREOPT support for ART Change-Id: I24d0d7b2a23a769f5d69bd4dc14be22e1475b759
2013-11-15 08:44:56 +01:00
#######################################
Better handle of need_compile_java. Change-Id: I609a27e2b35b08962243b6516c6c525c0c938d3c
2013-08-28 22:04:46 +02:00
# Make sure there's something to build.
ifdef full_classes_jar
ifndef need_compile_java
Clearer error if module doesn't declare any source files Bug: 72552006 Test: Make a module with no source files, run `m -j nothing`, notice that the error tells which module has no sources Change-Id: Ib169e7b3cb86d840a3acd644e42cd1f9f65e1304
2018-02-27 03:00:25 +01:00
$(call pretty-error,Target java module does not define any source or resource files)
Better handle of need_compile_java. Change-Id: I609a27e2b35b08962243b6516c6c525c0c938d3c
2013-08-28 22:04:46 +02:00
endif
endif
auto import from //depot/cupcake/@135843
2009-03-04 04:28:42 +01:00
# Since we're using intermediates.COMMON, make sure that it gets cleaned
# properly.
$(cleantarget): PRIVATE_CLEAN_FILES += $(intermediates.COMMON)
Better handle of need_compile_java. Change-Id: I609a27e2b35b08962243b6516c6c525c0c938d3c
2013-08-28 22:04:46 +02:00
ifdef full_classes_jar
auto import from //depot/cupcake/@135843
2009-03-04 04:28:42 +01:00
AI 145618: am: CL 145333 Cloned from CL 144759 by 'g4 patch'. Original change by joeo@abreu on 2009/04/06 19:54:13. Implement SDK add-ons in the build system. - Add an option to use the standard javadoc doclet instead of droiddoc, since droiddocs non-sdk templates aren't ready for prime time. - Add the notion of a stubs for a library. It's only implemented for java libraries, but when we do native libraries in the NDK or sdk-addons, it will work there too. Original author: joeo Merged from: //branches/cupcake/... Automated import of CL 145618
2009-04-10 04:31:12 +02:00
# Droiddoc isn't currently able to generate stubs for modules, so we're just
# allowing it to use the classes.jar as the "stubs" that would be use to link
# against, for the cases where someone needs the jar to link against.
Optimize out extra jar copies Don't copy jar files for disabled stages. Instead, set the name of the output to the name of the input so the next stage will directly pick up the output of the previous stage. Test: m -j ANDROID_COMPILE_WITH_JACK=false java Change-Id: Ib7268cbff7ea7ff2ad2caf994aa145e1b7a12b83
2017-03-29 21:17:36 +02:00
$(eval $(call copy-one-file,$(full_classes_jar),$(full_classes_stubs_jar)))
Access ALL_MODULES subvars with my_register_name ALL_MODULES and subvars are registered with my_register_name. Replace references of ALL_MODULES.$(LOCAL_MODULE).* with ALL_MODULES.$(my_register_name).*. Bug: 155869107 Test: TH presubmit build pass Test: TH presubmit build noop Change-Id: I1481c341a285dc04de86619abec3194bb92c9739
2020-05-08 09:38:46 +02:00
ALL_MODULES.$(my_register_name).STUBS := $(full_classes_stubs_jar)
AI 145618: am: CL 145333 Cloned from CL 144759 by 'g4 patch'. Original change by joeo@abreu on 2009/04/06 19:54:13. Implement SDK add-ons in the build system. - Add an option to use the standard javadoc doclet instead of droiddoc, since droiddocs non-sdk templates aren't ready for prime time. - Add the notion of a stubs for a library. It's only implemented for java libraries, but when we do native libraries in the NDK or sdk-addons, it will work there too. Original author: joeo Merged from: //branches/cupcake/... Automated import of CL 145618
2009-04-10 04:31:12 +02:00
Add a tool to let you enforce layering between packages in a java module. And build system support for it too. Change-Id: I4dd5ed0b9edab6e8884b0d00cfeeae5fa38d967a
2011-10-31 05:37:35 +01:00
# The layers file allows you to enforce a layering between java packages.
Replace build/tools with build/make/tools Test: m checkbuild Change-Id: I8db6c27a6d2372f142d10568fe92d6f2e9a59252
2017-12-06 23:38:40 +01:00
# Run build/make/tools/java-layers.py for more details.
Add a tool to let you enforce layering between packages in a java module. And build system support for it too. Change-Id: I4dd5ed0b9edab6e8884b0d00cfeeae5fa38d967a
2011-10-31 05:37:35 +01:00
layers_file := $(addprefix $(LOCAL_PATH)/, $(LOCAL_JAVA_LAYERS_FILE))
$(full_classes_compiled_jar): PRIVATE_JAVA_LAYERS_FILE := $(layers_file)
Use PRIVATE_WARNINGS_ENABLE Before this LOCA_WARNINGS_ENABLE never worked :-( Change-Id: I129a0bbbbb68e4179454b0827b0b0d18d6de67a0
2012-10-18 19:54:49 +02:00
$(full_classes_compiled_jar): PRIVATE_WARNINGS_ENABLE := $(LOCAL_WARNINGS_ENABLE)
Add a tool to let you enforce layering between packages in a java module. And build system support for it too. Change-Id: I4dd5ed0b9edab6e8884b0d00cfeeae5fa38d967a
2011-10-31 05:37:35 +01:00
Automated import from //branches/donutburger/...@140982,140982
2009-03-25 03:07:34 +01:00
# Compile the java files to a .jar file.
# This intentionally depends on java_sources, not all_java_sources.
# Deps for generated source files must be handled separately,
# via deps on the target that generates the sources.
Add support for LOCAL_ERROR_PRONE_FLAGS This will allow individual modules to enable error prone checks as needed so that the change to treat an error prone check as a compiler error can be done atomically with the changes to fix the issues that check reveals. Tested with the following steps, cleaning up the targets in between to ensure that it was rebuilt everytime. Set LOCAL_ERROR_PRONE_FLAGS := -Xep:ClassCanBeStatic:WARN compiler error in junit-params-test target. Built javac-check-junit-params-test with RUN_ERROR_PRONE=true to make sure that compilation failed. Built the javac-check-junit-params-test without RUN_ERROR_PRONE set to make sure that the flag is not included unless explicitly requested. Built the junit-params-test as normal to make sure it still worked properly. Bug: 31507496 Test: See above Change-Id: I88b5800dacd0e30dd9dcfa5f42e89d1428957365
2016-09-20 16:12:30 +02:00
Enable stripping of java debug information when required. We're removing LocalVariableType / LocalVariableType in order to save space. Enabling stripping reduces AOSP image size save by ~12MB. Bug: 38224820 Test: CtsLibcoreTestCases Change-Id: I3168d73ec6825aa5879db7e1135d7ed61d488d72
2017-06-30 15:51:12 +02:00
# For user / userdebug builds, strip the local variable table and the local variable
# type table. This has no bearing on stack traces, but will leave less information
# available via JDWP.
ifneq (,$(PRODUCT_MINIMIZE_JAVA_DEBUG_INFO))
ifneq (,$(filter userdebug user,$(TARGET_BUILD_VARIANT)))
LOCAL_JAVACFLAGS+= -g:source,lines
endif
endif
Separate java source list generation into its own rule Move the java source list generation step into its own rule. This has a couple of advantages. It consolidates the source list generation so that it only has to run once for javac, jack, and jack-check. It also massively reduces the length of the javac command line, so that error messages are significantly shorter, and allows easily rerunning the failing build command because the file list is still on disk. The primary disadvantage is that javac error messages no longer include the list of files passed to javac, but the list is available earlier in the build long when the file list was written, and is still available on disk. Test: m -j javac-check Change-Id: I9730b352b33a060e08221b61c11c617d23320d67
2017-05-27 00:22:02 +02:00
# List of dependencies for anything that needs all java sources in place
java_sources_deps := \
$(java_sources) \
$(java_resource_sources) \
Add LOCAL_SRCJARS support Allow java modules to take jars containing .java files as an input. For turbine, pass them directly to turbine. For javac, extract them to a directory and pass a list of the files to javac. Bug: 73885582 Test: m checkbuild Change-Id: Ib4351a5b4b165a55e5fb02ee2680466db368983a
2018-03-08 00:44:54 +01:00
$(LOCAL_SRCJARS) \
Separate java source list generation into its own rule Move the java source list generation step into its own rule. This has a couple of advantages. It consolidates the source list generation so that it only has to run once for javac, jack, and jack-check. It also massively reduces the length of the javac command line, so that error messages are significantly shorter, and allows easily rerunning the failing build command because the file list is still on disk. The primary disadvantage is that javac error messages no longer include the list of files passed to javac, but the list is available earlier in the build long when the file list was written, and is still available on disk. Test: m -j javac-check Change-Id: I9730b352b33a060e08221b61c11c617d23320d67
2017-05-27 00:22:02 +02:00
$(LOCAL_ADDITIONAL_DEPENDENCIES)
Add missing dependencies to python scripts These were found when trying to run remotely on RBE with only the sources depended upon available for each rule. Bug: 130111713 Test: treehugger Change-Id: Id763f8fc7dfbe60445f98604db3422147165f537
2019-06-11 01:39:45 +02:00
$(java_source_list_file): $(java_sources_deps) $(NORMALIZE_PATH)
Separate java source list generation into its own rule Move the java source list generation step into its own rule. This has a couple of advantages. It consolidates the source list generation so that it only has to run once for javac, jack, and jack-check. It also massively reduces the length of the javac command line, so that error messages are significantly shorter, and allows easily rerunning the failing build command because the file list is still on disk. The primary disadvantage is that javac error messages no longer include the list of files passed to javac, but the list is available earlier in the build long when the file list was written, and is still available on disk. Test: m -j javac-check Change-Id: I9730b352b33a060e08221b61c11c617d23320d67
2017-05-27 00:22:02 +02:00
$(write-java-source-list)
AIDEGen: Collect the srcjar path of modules into module-info.json By design doc: go/aidegen-doc-generate-R In order to generate R.java of app modules, AIDEGen needs to build the module. It might cause system.img oversized so we turn to build the target srcjar file if it exists in module-info.json. Build module-info.json without this change: Build time: 1m47.227s File size: 14,186,429 Bytes Build module-info.json with this change: Build time: 1m46.796s File size: 14,614,470 Bytes Bug: 132407603 Test: 1. m out/target/product/generic_x86_64/module-info.json 2. by grep "target/common/obj/APPS/Settings_intermediates/aapt2.srcjar" in module-info.json. Change-Id: I09c812aede0324bc38acbead0a863a85ae15b33e
2019-05-10 09:34:26 +02:00
ALL_MODULES.$(my_register_name).SRCJARS := $(LOCAL_SRCJARS)
Allow disabling turbine m -j TURBINE_ENABLED=false will build without turbine. This is primarily useful for A/B comparisions of turbine builds, but will also be used to temporarily disable turbine for unbundled builds until we have turbine prebuilts. Bug: 64308460 Test: m -j TURBINE_ENABLED=false java Test: m -j java Change-Id: Ie48746c8bfc60c361be9634cb1805ca1c09aa1fe
2017-09-27 01:17:24 +02:00
ifneq ($(TURBINE_ENABLED),false)
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
$(full_classes_turbine_jar): PRIVATE_JAVACFLAGS := $(LOCAL_JAVACFLAGS) $(annotation_processor_flags)
Add LOCAL_SRCJARS support Allow java modules to take jars containing .java files as an input. For turbine, pass them directly to turbine. For javac, extract them to a directory and pass a list of the files to javac. Bug: 73885582 Test: m checkbuild Change-Id: Ib4351a5b4b165a55e5fb02ee2680466db368983a
2018-03-08 00:44:54 +01:00
$(full_classes_turbine_jar): PRIVATE_SRCJARS := $(LOCAL_SRCJARS)
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
$(full_classes_turbine_jar): \
$(java_source_list_file) \
$(java_sources_deps) \
$(full_java_header_libs) \
Add dependencies on bootclasspath libraries The libraries in the bootclasspath were getting their dependencies because they were also in the default libraries list. Make the dependencies explicit in preparation for rearranging the default libraries. Test: m -j checkbuild Change-Id: I3ea004714a31cd648ec2ef57ed3099bce70bc6b9
2017-09-24 03:19:05 +02:00
$(full_java_bootclasspath_libs) \
Use system modules generated by soong when using javac -target 1.9 Soong has support for building system modules. Use the directories produced by Soong with --system to replace -bootclasspath arguments when using javac -target 1.9. Since soong can't generate current SDK stubs yet, and no existing SDK stubs need -target, only use -target 1.9 for modules that are not compiling against the SDK. That means in practice the only system modules that will be used for now is the default one, core-system-modules. Bug: 63986449 Test: m -j EXPERIMENTAL_USE_OPENJDK9=true makes some progress Change-Id: I350ef50aedf36fdd72458c23d4fe8a2edf1a9a02
2017-10-12 22:34:40 +02:00
$(full_java_system_modules_deps) \
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
$(NORMALIZE_PATH) \
$(JAR_ARGS) \
$(ZIPTIME) \
Use merge_zips to merge jars during Java build in Make. 1. Use merge_zips to merge jars without unzipping/rezipping static Java libraries. And seperate merging process as a independent Make target so that Javac can only depend on Turbine. 2. Remove duplicate vars: "full_java_lib_deps" in droiddoc.mk 3. Also use classes-header.jar for link_apk & link_instr Bug: b/65455145 Test: m clean && m -j32 Change-Id: I7b0307664a6b86075c983284fce099bd3946318c
2017-09-13 22:13:53 +02:00
| $(TURBINE) \
$(MERGE_ZIPS)
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
$(transform-java-to-header.jar)
.KATI_RESTAT: $(full_classes_turbine_jar)
# Run jarjar before generate classes-header.jar if necessary.
ifneq ($(strip $(LOCAL_JARJAR_RULES)),)
$(full_classes_header_jarjar): PRIVATE_JARJAR_RULES := $(LOCAL_JARJAR_RULES)
$(full_classes_header_jarjar): $(full_classes_turbine_jar) $(LOCAL_JARJAR_RULES) | $(JARJAR)
Turn missing jarjar output files into errors Jarjar doesn't exit with a nonzero return code when there is a syntax error in a rules file and doesn't write the output file. Without a nonzero return code ninja prints a warning but continues, which leads to stale results on incremental builds where the output file already exists, or delayed errors on clean builds whre the output file didn't exist. Delete the output file before running jarjar, and then check if it exists after running jarjar. Fixes: 119516143 Test: m out/target/common/obj/JAVA_LIBRARIES/noto-emoji-compat-java_intermediates/classes-jarjar.jar Change-Id: Ib99167403948ee11f039dd4d2d7e63052bb92136
2021-02-08 19:55:05 +01:00
$(call transform-jarjar)
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
else
full_classes_header_jarjar := $(full_classes_turbine_jar)
endif
$(eval $(call copy-one-file,$(full_classes_header_jarjar),$(full_classes_header_jar)))
Allow disabling turbine m -j TURBINE_ENABLED=false will build without turbine. This is primarily useful for A/B comparisions of turbine builds, but will also be used to temporarily disable turbine for unbundled builds until we have turbine prebuilts. Bug: 64308460 Test: m -j TURBINE_ENABLED=false java Test: m -j java Change-Id: Ie48746c8bfc60c361be9634cb1805ca1c09aa1fe
2017-09-27 01:17:24 +02:00
endif # TURBINE_ENABLED != false
Disable goma for javac actions in Make goma can't handle the --system argument that Android must pass to javac. Bug: b/143658984 Test: treehugger Change-Id: I7091a14f940ae696930c9d4a7869ae3a81a33fbe
2020-03-05 21:41:30 +01:00
# TODO(b/143658984): goma can't handle the --system argument to javac.
#$(full_classes_compiled_jar): .KATI_NINJA_POOL := $(GOMA_POOL)
Put javac, d8 and r8 rules into RBE ninja pool javac, d8 and r8 rules for module defined in Android.mk files are running remotely with RBE but are running in the local ninja pool, restricting them to only running as many jobs in parallel as there are local CPUs. Set the ninja pool to let them run 500 jobs in parallel. Bug: 228603472 Test: m checkbuild Change-Id: I60f7859f3657fc1eff0daf0e0a1b0f9fe63551b6
2022-04-08 19:52:08 +02:00
$(full_classes_compiled_jar): .KATI_NINJA_POOL := $(JAVAC_NINJA_POOL)
Remove sharding support from make Sharding is not used in make any more, the large java modules (libcore and framework) have moved to Soong. Keeping sharding support complicates java compiling, so remove it. Bug: 73885582 Test: m checkbuild Change-Id: I2932f9e96bfc8f2ebf82095b16d6c0b3c51613f0
2018-03-07 23:16:43 +01:00
$(full_classes_compiled_jar): PRIVATE_JAVACFLAGS := $(LOCAL_JAVACFLAGS) $(annotation_processor_flags)
$(full_classes_compiled_jar): PRIVATE_JAR_EXCLUDE_FILES := $(LOCAL_JAR_EXCLUDE_FILES)
$(full_classes_compiled_jar): PRIVATE_JAR_PACKAGES := $(LOCAL_JAR_PACKAGES)
$(full_classes_compiled_jar): PRIVATE_JAR_EXCLUDE_PACKAGES := $(LOCAL_JAR_EXCLUDE_PACKAGES)
$(full_classes_compiled_jar): PRIVATE_JAVA_SOURCE_LIST := $(java_source_list_file)
$(full_classes_compiled_jar): PRIVATE_ALL_JAVA_HEADER_LIBRARIES := $(full_java_header_libs)
Add LOCAL_SRCJARS support Allow java modules to take jars containing .java files as an input. For turbine, pass them directly to turbine. For javac, extract them to a directory and pass a list of the files to javac. Bug: 73885582 Test: m checkbuild Change-Id: Ib4351a5b4b165a55e5fb02ee2680466db368983a
2018-03-08 00:44:54 +01:00
$(full_classes_compiled_jar): PRIVATE_SRCJARS := $(LOCAL_SRCJARS)
$(full_classes_compiled_jar): PRIVATE_SRCJAR_LIST_FILE := $(intermediates.COMMON)/srcjar-list
$(full_classes_compiled_jar): PRIVATE_SRCJAR_INTERMEDIATES_DIR := $(intermediates.COMMON)/srcjars
Remove sharding support from make Sharding is not used in make any more, the large java modules (libcore and framework) have moved to Soong. Keeping sharding support complicates java compiling, so remove it. Bug: 73885582 Test: m checkbuild Change-Id: I2932f9e96bfc8f2ebf82095b16d6c0b3c51613f0
2018-03-07 23:16:43 +01:00
$(full_classes_compiled_jar): \
$(java_source_list_file) \
$(full_java_header_libs) \
$(java_sources_deps) \
$(full_java_bootclasspath_libs) \
$(full_java_system_modules_deps) \
$(layers_file) \
$(annotation_processor_deps) \
$(NORMALIZE_PATH) \
$(JAR_ARGS) \
Replace extract_srcjars.sh with zipsync Use zipsync instead of extract_srcjars.sh. Also fixes an issue where unzipping a resource zip would ignore anything that wasn't a *.java file. Bug: 73885582 Test: m checkbuild Change-Id: I1c25f65afa196614879071c8655866febebac185
2018-03-16 00:26:08 +01:00
$(ZIPSYNC) \
Use soong_zip instead of jar to generate .jar files in javac actions This is to make the jar-output deterministic so that we can get cache-hits for r8/d8 actions from RBE. Change-Id: I911ee702fa5dabfe7122e82b21f78c811a0c960d Test: m droid checkbuild
2020-04-16 21:43:40 +02:00
$(SOONG_ZIP) \
Remove sharding support from make Sharding is not used in make any more, the large java modules (libcore and framework) have moved to Soong. Keeping sharding support complicates java compiling, so remove it. Bug: 73885582 Test: m checkbuild Change-Id: I2932f9e96bfc8f2ebf82095b16d6c0b3c51613f0
2018-03-07 23:16:43 +01:00
| $(SOONG_JAVAC_WRAPPER)
@echo "Target Java: $@
$(call compile-java,$(TARGET_JAVAC),$(PRIVATE_ALL_JAVA_HEADER_LIBRARIES))
Add phony target javac-check. javac-check covers all classes.jars that are compiled with javac instead of jack. This target is required by tools that still need java class files as input. Bug: 26705771 Change-Id: I6896b9a6026a2a0dae6145d1ef5a839756aa3458
2016-03-24 19:00:30 +01:00
javac-check : $(full_classes_compiled_jar)
Add targets for building individual modules using javac This is needed in order to be able to run error prone (which is a plugin replacement for javac) on a subset of the java code. Bug: 31507496 Test: Build javac-check-core-tests and check the resulting JAR Change-Id: I5a556920572fcdad7b39d67e3f00fe0e0f1f8f46
2016-09-15 15:34:42 +02:00
javac-check-$(LOCAL_MODULE) : $(full_classes_compiled_jar)
Mark more targets as PHONY So that we can start restricting non-phony targets to $OUT_DIR and $DIST_DIR. Test: add --writable=out/, see fewer warnings Change-Id: I411fe4af732b1bce35d4a4c1e2a47b5f8a15e6b8
2018-07-24 10:21:12 +02:00
.PHONY: javac-check-$(LOCAL_MODULE)
Add phony target javac-check. javac-check covers all classes.jars that are compiled with javac instead of jack. This target is required by tools that still need java class files as input. Bug: 26705771 Change-Id: I6896b9a6026a2a0dae6145d1ef5a839756aa3458
2016-03-24 19:00:30 +01:00
Use merge_zips to merge jars during Java build in Make. 1. Use merge_zips to merge jars without unzipping/rezipping static Java libraries. And seperate merging process as a independent Make target so that Javac can only depend on Turbine. 2. Remove duplicate vars: "full_java_lib_deps" in droiddoc.mk 3. Also use classes-header.jar for link_apk & link_instr Bug: b/65455145 Test: m clean && m -j32 Change-Id: I7b0307664a6b86075c983284fce099bd3946318c
2017-09-13 22:13:53 +02:00
$(full_classes_combined_jar): PRIVATE_DONT_DELETE_JAR_META_INF := $(LOCAL_DONT_DELETE_JAR_META_INF)
$(full_classes_combined_jar): $(full_classes_compiled_jar) \
Move private_manifest file insertion to jars merging phase. By doing this, the change of private_manifest file won't trigger Javac to re-run during re-build. Bug: b/65455145 Test: m clean && m -j32 Change-Id: Ib90d56daf0be5f31b51e07b7714a933bc5cf4496
2017-09-20 23:56:48 +02:00
$(jar_manifest_file) \
Use merge_zips to merge jars during Java build in Make. 1. Use merge_zips to merge jars without unzipping/rezipping static Java libraries. And seperate merging process as a independent Make target so that Javac can only depend on Turbine. 2. Remove duplicate vars: "full_java_lib_deps" in droiddoc.mk 3. Also use classes-header.jar for link_apk & link_instr Bug: b/65455145 Test: m clean && m -j32 Change-Id: I7b0307664a6b86075c983284fce099bd3946318c
2017-09-13 22:13:53 +02:00
$(full_static_java_libs) | $(MERGE_ZIPS)
Move private_manifest file insertion to jars merging phase. By doing this, the change of private_manifest file won't trigger Javac to re-run during re-build. Bug: b/65455145 Test: m clean && m -j32 Change-Id: Ib90d56daf0be5f31b51e07b7714a933bc5cf4496
2017-09-20 23:56:48 +02:00
$(if $(PRIVATE_JAR_MANIFEST), $(hide) sed -e "s/%BUILD_NUMBER%/$(BUILD_NUMBER_FROM_FILE)/" \
$(PRIVATE_JAR_MANIFEST) > $(dir $@)/manifest.mf)
Disable duplicates warnings when merging jars There are too many duplicates warnings, disable them until someone is actually looking at them. Bug: 69316739 Test: m checkbuild Change-Id: Ifb67dbf7734b5f53941d110f578c4fe642e36005
2018-02-14 19:32:48 +01:00
$(MERGE_ZIPS) -j --ignore-duplicates $(if $(PRIVATE_JAR_MANIFEST),-m $(dir $@)/manifest.mf) \
Move private_manifest file insertion to jars merging phase. By doing this, the change of private_manifest file won't trigger Javac to re-run during re-build. Bug: b/65455145 Test: m clean && m -j32 Change-Id: Ib90d56daf0be5f31b51e07b7714a933bc5cf4496
2017-09-20 23:56:48 +02:00
$(if $(PRIVATE_DONT_DELETE_JAR_META_INF),,-stripDir META-INF -zipToNotStrip $<) \
Remove reverse-list from java static libraries. Make was reversing the list of static library dependencies when passing it to merge_zips. This was originally done to match the behavior of unzipping each static library in order into the same directory, overwriting duplicates each time. This order is counter-intuitive, and Soong does it the sensible way (first one takes priority, the same as the compile classpath). Fix Make to match Soong. Bug: 131603999 Test: m checkbuild Test: compare target_files.zip Change-Id: Idad125068ed2f750dc2dd95ab82bacb6e074489d
2019-04-29 19:25:20 +02:00
$@ $< $(PRIVATE_STATIC_JAVA_LIBRARIES)
Use merge_zips to merge jars during Java build in Make. 1. Use merge_zips to merge jars without unzipping/rezipping static Java libraries. And seperate merging process as a independent Make target so that Javac can only depend on Turbine. 2. Remove duplicate vars: "full_java_lib_deps" in droiddoc.mk 3. Also use classes-header.jar for link_apk & link_instr Bug: b/65455145 Test: m clean && m -j32 Change-Id: I7b0307664a6b86075c983284fce099bd3946318c
2017-09-13 22:13:53 +02:00
Add LOCAL_JAR_PROCESSOR Allow using a host java library as an intermediate processor step after javac but before desugar, proguard, or dx. Test: manual Change-Id: I7fb843e10d96c0167f6e4371582fabcc1454521f
2017-05-23 01:21:49 +02:00
ifdef LOCAL_JAR_PROCESSOR
# LOCAL_JAR_PROCESSOR_ARGS must be evaluated here to set up the rule-local
# PRIVATE_JAR_PROCESSOR_ARGS variable, but $< and $@ are not available yet.
# Set ${in} and ${out} so they can be referenced by LOCAL_JAR_PROCESSOR_ARGS
# using deferred evaluation (LOCAL_JAR_PROCESSOR_ARGS = instead of :=).
Use merge_zips to merge jars during Java build in Make. 1. Use merge_zips to merge jars without unzipping/rezipping static Java libraries. And seperate merging process as a independent Make target so that Javac can only depend on Turbine. 2. Remove duplicate vars: "full_java_lib_deps" in droiddoc.mk 3. Also use classes-header.jar for link_apk & link_instr Bug: b/65455145 Test: m clean && m -j32 Change-Id: I7b0307664a6b86075c983284fce099bd3946318c
2017-09-13 22:13:53 +02:00
in := $(full_classes_combined_jar)
Add LOCAL_JAR_PROCESSOR Allow using a host java library as an intermediate processor step after javac but before desugar, proguard, or dx. Test: manual Change-Id: I7fb843e10d96c0167f6e4371582fabcc1454521f
2017-05-23 01:21:49 +02:00
out := $(full_classes_processed_jar).tmp
Fix LOCAL_JAR_PROCESSOR dependency The LOCAL_JAR_PROCESSOR rule should depend on the path to the processor jar and not the module name. Test: m -j && m -j Change-Id: I5ebd4cd3ad4429918edfd0a8cb5cb9a4e7e86ca7
2017-07-14 04:25:47 +02:00
my_jar_processor := $(HOST_OUT_JAVA_LIBRARIES)/$(LOCAL_JAR_PROCESSOR).jar
Add LOCAL_JAR_PROCESSOR Allow using a host java library as an intermediate processor step after javac but before desugar, proguard, or dx. Test: manual Change-Id: I7fb843e10d96c0167f6e4371582fabcc1454521f
2017-05-23 01:21:49 +02:00
$(full_classes_processed_jar): PRIVATE_JAR_PROCESSOR_ARGS := $(LOCAL_JAR_PROCESSOR_ARGS)
Fix LOCAL_JAR_PROCESSOR dependency The LOCAL_JAR_PROCESSOR rule should depend on the path to the processor jar and not the module name. Test: m -j && m -j Change-Id: I5ebd4cd3ad4429918edfd0a8cb5cb9a4e7e86ca7
2017-07-14 04:25:47 +02:00
$(full_classes_processed_jar): PRIVATE_JAR_PROCESSOR := $(my_jar_processor)
Add LOCAL_JAR_PROCESSOR Allow using a host java library as an intermediate processor step after javac but before desugar, proguard, or dx. Test: manual Change-Id: I7fb843e10d96c0167f6e4371582fabcc1454521f
2017-05-23 01:21:49 +02:00
$(full_classes_processed_jar): PRIVATE_TMP_OUT := $(out)
in :=
out :=
Use merge_zips to merge jars during Java build in Make. 1. Use merge_zips to merge jars without unzipping/rezipping static Java libraries. And seperate merging process as a independent Make target so that Javac can only depend on Turbine. 2. Remove duplicate vars: "full_java_lib_deps" in droiddoc.mk 3. Also use classes-header.jar for link_apk & link_instr Bug: b/65455145 Test: m clean && m -j32 Change-Id: I7b0307664a6b86075c983284fce099bd3946318c
2017-09-13 22:13:53 +02:00
$(full_classes_processed_jar): $(full_classes_combined_jar) $(my_jar_processor)
Add LOCAL_JAR_PROCESSOR Allow using a host java library as an intermediate processor step after javac but before desugar, proguard, or dx. Test: manual Change-Id: I7fb843e10d96c0167f6e4371582fabcc1454521f
2017-05-23 01:21:49 +02:00
@echo Processing $@ with $(PRIVATE_JAR_PROCESSOR)
$(hide) rm -f $@ $(PRIVATE_TMP_OUT)
Provide make variables for java binaries Replace java -> $(JAVA), etc. to prepare for moving java binaries out of the path and using full paths to them. Test: builds Bug: 62956999 Change-Id: I5dfcd0d4e855ecde69cd127169e9545e59723d12
2017-06-30 22:55:38 +02:00
$(hide) $(JAVA) -jar $(PRIVATE_JAR_PROCESSOR) $(PRIVATE_JAR_PROCESSOR_ARGS)
Add LOCAL_JAR_PROCESSOR Allow using a host java library as an intermediate processor step after javac but before desugar, proguard, or dx. Test: manual Change-Id: I7fb843e10d96c0167f6e4371582fabcc1454521f
2017-05-23 01:21:49 +02:00
$(hide) mv $(PRIVATE_TMP_OUT) $@
Fix LOCAL_JAR_PROCESSOR dependency The LOCAL_JAR_PROCESSOR rule should depend on the path to the processor jar and not the module name. Test: m -j && m -j Change-Id: I5ebd4cd3ad4429918edfd0a8cb5cb9a4e7e86ca7
2017-07-14 04:25:47 +02:00
my_jar_processor :=
Add LOCAL_JAR_PROCESSOR Allow using a host java library as an intermediate processor step after javac but before desugar, proguard, or dx. Test: manual Change-Id: I7fb843e10d96c0167f6e4371582fabcc1454521f
2017-05-23 01:21:49 +02:00
else
Use merge_zips to merge jars during Java build in Make. 1. Use merge_zips to merge jars without unzipping/rezipping static Java libraries. And seperate merging process as a independent Make target so that Javac can only depend on Turbine. 2. Remove duplicate vars: "full_java_lib_deps" in droiddoc.mk 3. Also use classes-header.jar for link_apk & link_instr Bug: b/65455145 Test: m clean && m -j32 Change-Id: I7b0307664a6b86075c983284fce099bd3946318c
2017-09-13 22:13:53 +02:00
full_classes_processed_jar := $(full_classes_combined_jar)
Add LOCAL_JAR_PROCESSOR Allow using a host java library as an intermediate processor step after javac but before desugar, proguard, or dx. Test: manual Change-Id: I7fb843e10d96c0167f6e4371582fabcc1454521f
2017-05-23 01:21:49 +02:00
endif
Move classes.jar generation right below JarJar phase. By doing this, we don't need run desugar/Jacoco/proguard twice for static java libraries(one for their self build, another for downstream dependents). Test: m clean && m java Bug: b/65455145 Change-Id: I87aee34940937dbde33a977f55d1faf2c8054561
2017-09-13 23:56:11 +02:00
# Run jarjar if necessary
ifneq ($(strip $(LOCAL_JARJAR_RULES)),)
$(full_classes_jarjar_jar): PRIVATE_JARJAR_RULES := $(LOCAL_JARJAR_RULES)
$(full_classes_jarjar_jar): $(full_classes_processed_jar) $(LOCAL_JARJAR_RULES) | $(JARJAR)
Turn missing jarjar output files into errors Jarjar doesn't exit with a nonzero return code when there is a syntax error in a rules file and doesn't write the output file. Without a nonzero return code ninja prints a warning but continues, which leads to stale results on incremental builds where the output file already exists, or delayed errors on clean builds whre the output file didn't exist. Delete the output file before running jarjar, and then check if it exists after running jarjar. Fixes: 119516143 Test: m out/target/common/obj/JAVA_LIBRARIES/noto-emoji-compat-java_intermediates/classes-jarjar.jar Change-Id: Ib99167403948ee11f039dd4d2d7e63052bb92136
2021-02-08 19:55:05 +01:00
$(call transform-jarjar)
Move classes.jar generation right below JarJar phase. By doing this, we don't need run desugar/Jacoco/proguard twice for static java libraries(one for their self build, another for downstream dependents). Test: m clean && m java Bug: b/65455145 Change-Id: I87aee34940937dbde33a977f55d1faf2c8054561
2017-09-13 23:56:11 +02:00
else
full_classes_jarjar_jar := $(full_classes_processed_jar)
endif
Run jetifier against prebuilts directly rather than classes.jar It turns out that the resource files inside the .aar files may need rewriting too Bug: 72552006 Test: Set LOCAL_JETIFIED_ENABLED for a prebuilt and built it See also one of the patches after this one and its topic which contains a sample for testing Change-Id: I89d0b4aa8d5c6ae3abc2344dd05222cf9672d5c0 (cherry picked from commit ed170e72961dab855848bc58527923cbeba551b5)
2018-02-27 20:05:40 +01:00
$(eval $(call copy-one-file,$(full_classes_jarjar_jar),$(full_classes_jar)))
Move jacoco before desugar R8 will replace desugar+proguard+dx, which will mean jacoco has to run before desugar. In preparation, move jacoco before desugar now. Test: m EMMA_INSTRUMENT=true EMMA_INSTRUMENT_FRAMEWORK=true SKIP_BOOT_JARS_CHECK=true WITH_DEXPREOPT=false tests Change-Id: I0627a79ba2f0b26a113d5d8bcc5cb1fda08295a1
2017-12-23 01:51:23 +01:00
#######################################
Add rule to enable running Jetifier within Make against Java modules The only case where we expect to actually enable this behavior is for modules that are just an unpacking of a prebuilt, because those are the only cases for which we can't conveniently just change the source Bug: 72552006 Test: ./build/soong/scripts/diff_build_graphs.sh \ --products=aosp_arm 'build/make:work^' \ 'build/make:work' Test: cherry-pick the following patch that depends on this one and the rest of that patch's topic, and then do `m -j jeffapp` Change-Id: I62e231900d6d87673ddf19c7fc2686fef2828590
2018-01-31 23:34:07 +01:00
LOCAL_FULL_CLASSES_PRE_JACOCO_JAR := $(full_classes_jar)
Move jacoco before desugar R8 will replace desugar+proguard+dx, which will mean jacoco has to run before desugar. In preparation, move jacoco before desugar now. Test: m EMMA_INSTRUMENT=true EMMA_INSTRUMENT_FRAMEWORK=true SKIP_BOOT_JARS_CHECK=true WITH_DEXPREOPT=false tests Change-Id: I0627a79ba2f0b26a113d5d8bcc5cb1fda08295a1
2017-12-23 01:51:23 +01:00
include $(BUILD_SYSTEM)/jacoco.mk
#######################################
Tweak comments for OpenJDK 9 build toolchain logic. This addresses review comments on the preceding CL http://r.android.com/539055 Test: Treehugger Change-Id: Icb0674190db3d638546a0ed49dbcb97d0698e549
2017-11-17 14:02:12 +01:00
# Temporarily enable --multi-dex until proguard supports v53 class files
# ( http://b/67673860 ) or we move away from proguard altogether.
Skip Proguard for EXPERIMENTAL_USE_OPENJDK9=true Proguard doesn't support v53 class files. For now, this CL simply replaces the Proguard step with a plain 'cp', which is essentially a no-op. To avoid apps exceeding the dex limit in this mode, this CL also enables --multi-dex for those builds. Test: Treehugger Bug: 67673860 Change-Id: I17dc5d827360d606a0cac12e324f97e8dedbb630
2017-10-25 03:38:01 +02:00
LOCAL_DX_FLAGS := $(filter-out --multi-dex,$(LOCAL_DX_FLAGS)) --multi-dex
Revert "Revert "Remove desugar support"" This reverts commit cf7407ed615cb3c694c20ce3d47a7be8b413bda3. Reason for revert: includes art veridex fix this time Change-Id: I970b51e6a6c6f377cfe793f029d9674e7ee0ed15
2018-06-06 23:46:25 +02:00
full_classes_pre_proguard_jar := $(LOCAL_FULL_CLASSES_JACOCO_JAR)
Fix and enable proguard on packages.
2010-02-01 18:51:23 +01:00
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
# Keep a copy of the jar just before proguard processing.
$(eval $(call copy-one-file,$(full_classes_pre_proguard_jar),$(intermediates.COMMON)/classes-pre-proguard.jar))
Use .KATI_RESTAT to reduce unnecessary rebuilds of .jar files The same optimization was done for binaries in https://android-review.googlesource.com/#/c/175250/ To create a TOC file from .jar files, this change introduces ijar, which is designed for this purpose. Only #include lines were modified from the original version. https://github.com/bazelbuild/bazel/tree/master/third_party/ijar Performance: $ m && touch frameworks/base/core/java/com/google/android/util/Procedure.java && time m Before: 4m30s (1580 targets) After: 3m57s (772 targets) Unfortunately, the improvement is small yet, but local experiments showed we can cut ~2 more minutes if the similar optimization is done for .dex files. (cherry picked from commit c1f5d9c203324b9435414e789c02394ca99c98f7) Bug: 24597504 Change-Id: Iec3b2b0b0e674bee5d80cce3c300dc8fad6e7c13
2015-11-09 08:47:42 +01:00
Optimize out extra jar copies Don't copy jar files for disabled stages. Instead, set the name of the output to the name of the input so the next stage will directly pick up the output of the previous stage. Test: m -j ANDROID_COMPILE_WITH_JACK=false java Change-Id: Ib7268cbff7ea7ff2ad2caf994aa145e1b7a12b83
2017-03-29 21:17:36 +02:00
# Run proguard if necessary
Make it easier to enable obfuscation and optimization. With this change, use: * LOCAL_PROGUARD_ENABLED := obfuscation # to enable obfuscation * LOCAL_PROGUARD_ENABLED := optimization # to enable optimization * LOCAL_PROGUARD_ENABLED := obfuscation optimization # to enable both Now the meaning of the LOCAL_PROGUARD_ENABLED options: * full: Use the build system's default configurations: with shrink but no obfuscation or optimization, global proguard flags in build/core/proguard.flags are applied. * custom: The same as "full" except no aapt-generated resource-related proguard flags. * nosystem: Don't use any build system's default configurations; but aapt-generated proguard flags are still applied. You are responsible for any other flags. * disabled: Disable proguard. * obfuscation: The same as "full" but with obfuscation enabled. * optimization: The same as "full" but with optimization enabled. * no value (the default): The build system chooses the proper value: "full" if it's an app; "disabled" if it's a library. You can use more than 1 of them in a meaningful combination, for example: LOCAL_PROGUARD_ENABLED := obfuscation optimization Bug: 10307372 Change-Id: Id248caca3048e99547f16559fae74f4afe85c354
2013-08-22 03:32:49 +02:00
ifdef LOCAL_PROGUARD_ENABLED
Remove LOCAL_PROGUARD_ENABLED := nosystem None of the system options are controversial, and there are no longer any users of nosystem, so remove it. Test: m checkbuild Change-Id: Id1b946d83688d266ca2942c02c97e8b404c3755b
2017-12-28 18:43:41 +01:00
ifneq ($(filter-out full custom obfuscation optimization,$(LOCAL_PROGUARD_ENABLED)),)
Make it easier to enable obfuscation and optimization. With this change, use: * LOCAL_PROGUARD_ENABLED := obfuscation # to enable obfuscation * LOCAL_PROGUARD_ENABLED := optimization # to enable optimization * LOCAL_PROGUARD_ENABLED := obfuscation optimization # to enable both Now the meaning of the LOCAL_PROGUARD_ENABLED options: * full: Use the build system's default configurations: with shrink but no obfuscation or optimization, global proguard flags in build/core/proguard.flags are applied. * custom: The same as "full" except no aapt-generated resource-related proguard flags. * nosystem: Don't use any build system's default configurations; but aapt-generated proguard flags are still applied. You are responsible for any other flags. * disabled: Disable proguard. * obfuscation: The same as "full" but with obfuscation enabled. * optimization: The same as "full" but with optimization enabled. * no value (the default): The build system chooses the proper value: "full" if it's an app; "disabled" if it's a library. You can use more than 1 of them in a meaningful combination, for example: LOCAL_PROGUARD_ENABLED := obfuscation optimization Bug: 10307372 Change-Id: Id248caca3048e99547f16559fae74f4afe85c354
2013-08-22 03:32:49 +02:00
$(warning while processing: $(LOCAL_MODULE))
$(error invalid value for LOCAL_PROGUARD_ENABLED: $(LOCAL_PROGUARD_ENABLED))
endif
Add the ability to turn on proguard for java targets, and to call aapt to generate a rules file for proguard for stuff from the manifest and other resources that need to be kept.
2009-08-30 22:39:24 +02:00
proguard_dictionary := $(intermediates.COMMON)/proguard_dictionary
Keep the collected Proguard configuration This will work for both R8 and Proguard Test: m -j Settings && "manually check .../proguard_coniguration file" Change-Id: I1da7c3426b3511e2d5ad69852da8cec3245d7e54
2018-04-13 15:34:20 +02:00
proguard_configuration := $(intermediates.COMMON)/proguard_configuration
Raise SDK version for ProGuard processing when app links support library. When an app's LOCAL_SDK_VERSION is lower than the support library's LOCAL_SDK_VERSION, we artifically raises the "SDK version" "linked" by ProGuard, to - suppress ProGuard warnings of referencing symbols unknown to the lower SDK version. - prevent ProGuard stripping subclass in the support library that extends class added in the higher SDK version. This allows us to remove the dangerous ProGuard flag "-dontwarn android.support.**". Notes: - We don't raise the app's LOCAL_SDK_VERSION, so that the app's own code is still unable to use the higher SDK version. - For platform build, we can't just raise to the "current" SDK, because would break apps that use APIs removed from the current SDK. We raise it to framework.jar instead, which contains the most complete symbol set. Bug: 20658265 Change-Id: I90099073457a65cb8031fbaec6b396d68ce614a7 (cherry picked from commit 8e8d1e7abadb53d5dcb211fac6ab6ed20f5dc9ac)
2015-05-05 04:21:48 +02:00
Always raise proguard libraries The platform build system doesn't have the concept of a "compile sdk version", it uses the "min sdk version" throughout the compilation process. This means that no stage of the compilation process can introduce references to APIs that do not exist in the selected LOCAL_MIN_SDK_VERSION without causing problems. Support library worked around this by effectively making the "compile sdk version" "current" when running proguard if support library was in the direct dependency list. Extend the support library hack everywhere, and always use "current" or the full bootclasspath when running proguard. Test: m checkbuild Change-Id: Iaf5853361767f0ea3e9ad4ec908aadd72d639c79
2017-10-21 04:16:41 +02:00
# When an app contains references to APIs that are not in the SDK specified by
Consolidate the logic for the sdk prebuilt module names. I'm making some changes to it, and found the names are scattered in various places. Make a macro and re-use the logic instead. Bug: 77525052 Test: make droid Change-Id: I0f2da80b8b4d427353509b27ec720d024eee7a6e
2018-04-10 17:16:33 +02:00
# its LOCAL_SDK_VERSION for example added by support library or by runtime
Always raise proguard libraries The platform build system doesn't have the concept of a "compile sdk version", it uses the "min sdk version" throughout the compilation process. This means that no stage of the compilation process can introduce references to APIs that do not exist in the selected LOCAL_MIN_SDK_VERSION without causing problems. Support library worked around this by effectively making the "compile sdk version" "current" when running proguard if support library was in the direct dependency list. Extend the support library hack everywhere, and always use "current" or the full bootclasspath when running proguard. Test: m checkbuild Change-Id: Iaf5853361767f0ea3e9ad4ec908aadd72d639c79
2017-10-21 04:16:41 +02:00
# classes added by desugar, we artifically raise the "SDK version" "linked" by
# ProGuard, to
Raise SDK version for ProGuard processing when app links support library. When an app's LOCAL_SDK_VERSION is lower than the support library's LOCAL_SDK_VERSION, we artifically raises the "SDK version" "linked" by ProGuard, to - suppress ProGuard warnings of referencing symbols unknown to the lower SDK version. - prevent ProGuard stripping subclass in the support library that extends class added in the higher SDK version. This allows us to remove the dangerous ProGuard flag "-dontwarn android.support.**". Notes: - We don't raise the app's LOCAL_SDK_VERSION, so that the app's own code is still unable to use the higher SDK version. - For platform build, we can't just raise to the "current" SDK, because would break apps that use APIs removed from the current SDK. We raise it to framework.jar instead, which contains the most complete symbol set. Bug: 20658265 Change-Id: I90099073457a65cb8031fbaec6b396d68ce614a7 (cherry picked from commit 8e8d1e7abadb53d5dcb211fac6ab6ed20f5dc9ac)
2015-05-05 04:21:48 +02:00
# - suppress ProGuard warnings of referencing symbols unknown to the lower SDK version.
# - prevent ProGuard stripping subclass in the support library that extends class added in the higher SDK version.
Always raise proguard libraries The platform build system doesn't have the concept of a "compile sdk version", it uses the "min sdk version" throughout the compilation process. This means that no stage of the compilation process can introduce references to APIs that do not exist in the selected LOCAL_MIN_SDK_VERSION without causing problems. Support library worked around this by effectively making the "compile sdk version" "current" when running proguard if support library was in the direct dependency list. Extend the support library hack everywhere, and always use "current" or the full bootclasspath when running proguard. Test: m checkbuild Change-Id: Iaf5853361767f0ea3e9ad4ec908aadd72d639c79
2017-10-21 04:16:41 +02:00
# See b/20667396
my_proguard_sdk_raise :=
Raise SDK version for ProGuard processing when app links support library. When an app's LOCAL_SDK_VERSION is lower than the support library's LOCAL_SDK_VERSION, we artifically raises the "SDK version" "linked" by ProGuard, to - suppress ProGuard warnings of referencing symbols unknown to the lower SDK version. - prevent ProGuard stripping subclass in the support library that extends class added in the higher SDK version. This allows us to remove the dangerous ProGuard flag "-dontwarn android.support.**". Notes: - We don't raise the app's LOCAL_SDK_VERSION, so that the app's own code is still unable to use the higher SDK version. - For platform build, we can't just raise to the "current" SDK, because would break apps that use APIs removed from the current SDK. We raise it to framework.jar instead, which contains the most complete symbol set. Bug: 20658265 Change-Id: I90099073457a65cb8031fbaec6b396d68ce614a7 (cherry picked from commit 8e8d1e7abadb53d5dcb211fac6ab6ed20f5dc9ac)
2015-05-05 04:21:48 +02:00
ifdef LOCAL_SDK_VERSION
ifdef TARGET_BUILD_APPS
Support LOCAL_SDK_VERSION := core_current core_current is a pseudo SDK version which is a core Java API subset of the Android API. It is expected to be mainly used for external Java projects which are agnostic to Android; such as junit, guava, etc. A module built with this SDK version can only link to java modules of the same kind. It can't depend on modules built with LOCAL_SDK_VERSION := current or without LOCAL_SDK_VERSION. Bug: 72206056 Test: m -j Change-Id: I34a9696393aa6704fd6684a40ea5b05d3fb46b23
2018-01-30 16:14:55 +01:00
ifeq (,$(filter current system_current test_current core_current, $(LOCAL_SDK_VERSION)))
Consolidate the logic for the sdk prebuilt module names. I'm making some changes to it, and found the names are scattered in various places. Make a macro and re-use the logic instead. Bug: 77525052 Test: make droid Change-Id: I0f2da80b8b4d427353509b27ec720d024eee7a6e
2018-04-10 17:16:33 +02:00
my_proguard_sdk_raise := $(call java-lib-header-files, $(call resolve-prebuilt-sdk-module,current))
Raise progaurd library to platform libraries even for "current" SDK. Without this change, if an app with "LOCAL_SDK_VERSION := current" links against a static library that uses removed APIs, the app will fail ProGuard processing because the removed APIs can't be found in the current SDK. This works around the issue. Bug: 18510449 Bug: 20667396 Change-Id: Ia6e2a81cf5ecba972d155e56238ea946f8539411
2015-06-26 21:33:06 +02:00
endif
Raise SDK version for ProGuard processing when app links support library. When an app's LOCAL_SDK_VERSION is lower than the support library's LOCAL_SDK_VERSION, we artifically raises the "SDK version" "linked" by ProGuard, to - suppress ProGuard warnings of referencing symbols unknown to the lower SDK version. - prevent ProGuard stripping subclass in the support library that extends class added in the higher SDK version. This allows us to remove the dangerous ProGuard flag "-dontwarn android.support.**". Notes: - We don't raise the app's LOCAL_SDK_VERSION, so that the app's own code is still unable to use the higher SDK version. - For platform build, we can't just raise to the "current" SDK, because would break apps that use APIs removed from the current SDK. We raise it to framework.jar instead, which contains the most complete symbol set. Bug: 20658265 Change-Id: I90099073457a65cb8031fbaec6b396d68ce614a7 (cherry picked from commit 8e8d1e7abadb53d5dcb211fac6ab6ed20f5dc9ac)
2015-05-05 04:21:48 +02:00
else
# For platform build, we can't just raise to the "current" SDK,
# that would break apps that use APIs removed from the current SDK.
Rename the Default* constants in java/config. These values are used in two out of the many possible sdk_version configurations, and therefore weren't really defaults in any meaningful sense. Giving them more descriptive names makes the code easier to follow. Bug: 157640067 Test: m java Change-Id: I67767b2be72ed3d8cc879280036850096eb65415
2020-07-01 13:44:12 +02:00
my_proguard_sdk_raise := $(call java-lib-header-files,$(LEGACY_CORE_PLATFORM_BOOTCLASSPATH_LIBRARIES) $(FRAMEWORK_LIBRARIES))
Raise SDK version for ProGuard processing when app links support library. When an app's LOCAL_SDK_VERSION is lower than the support library's LOCAL_SDK_VERSION, we artifically raises the "SDK version" "linked" by ProGuard, to - suppress ProGuard warnings of referencing symbols unknown to the lower SDK version. - prevent ProGuard stripping subclass in the support library that extends class added in the higher SDK version. This allows us to remove the dangerous ProGuard flag "-dontwarn android.support.**". Notes: - We don't raise the app's LOCAL_SDK_VERSION, so that the app's own code is still unable to use the higher SDK version. - For platform build, we can't just raise to the "current" SDK, because would break apps that use APIs removed from the current SDK. We raise it to framework.jar instead, which contains the most complete symbol set. Bug: 20658265 Change-Id: I90099073457a65cb8031fbaec6b396d68ce614a7 (cherry picked from commit 8e8d1e7abadb53d5dcb211fac6ab6ed20f5dc9ac)
2015-05-05 04:21:48 +02:00
endif
Don't feed framework.jar to proguard for vendor apks We used to add framework.jar to proguard via -systemjars option even for the apks building againsd SDK. This was because the app might have references to hidden APIs via static libraries, etc. However, for vendor apks, the use of hidden API is strictly prohibited. So it is fine to not include framework.jar. Furthermore, including framework.jar even causes problems in some cases; if a java library (e.g., android.hidl.base-V1.0-java) is statically linked to both the app and the framework.jar, -systemjars frameworks.jar forcibly removes classes in the library from the app to have references to the non-public classes in framework.jar. This could fail some compliance tests. Fixing the problem by not raising SDK for apks located in vendor or odm partitions. Bug: 128574081 Test: m Change-Id: If2b658fead5b4bb4d8c023a37eb57a37ad9b741d
2019-04-03 15:22:37 +02:00
ifdef BOARD_SYSTEMSDK_VERSIONS
ifneq (,$(filter true,$(LOCAL_VENDOR_MODULE) $(LOCAL_ODM_MODULE) $(LOCAL_PROPRIETARY_MODULE)))
# But for vendor or odm apks, don't raise SDK as the apks are required to
# use SDK APIs only
my_proguard_sdk_raise :=
endif
endif
Raise SDK version for ProGuard processing when app links support library. When an app's LOCAL_SDK_VERSION is lower than the support library's LOCAL_SDK_VERSION, we artifically raises the "SDK version" "linked" by ProGuard, to - suppress ProGuard warnings of referencing symbols unknown to the lower SDK version. - prevent ProGuard stripping subclass in the support library that extends class added in the higher SDK version. This allows us to remove the dangerous ProGuard flag "-dontwarn android.support.**". Notes: - We don't raise the app's LOCAL_SDK_VERSION, so that the app's own code is still unable to use the higher SDK version. - For platform build, we can't just raise to the "current" SDK, because would break apps that use APIs removed from the current SDK. We raise it to framework.jar instead, which contains the most complete symbol set. Bug: 20658265 Change-Id: I90099073457a65cb8031fbaec6b396d68ce614a7 (cherry picked from commit 8e8d1e7abadb53d5dcb211fac6ab6ed20f5dc9ac)
2015-05-05 04:21:48 +02:00
endif
Remove proguard support R8 is always used now. Bug: 111885749 Test: m checkbuild Change-Id: I9ae586c6360f2e3050422090b4e08f27ae167758
2018-07-25 22:41:42 +02:00
legacy_proguard_flags := $(addprefix -libraryjars ,$(my_proguard_sdk_raise) \
Always raise proguard libraries The platform build system doesn't have the concept of a "compile sdk version", it uses the "min sdk version" throughout the compilation process. This means that no stage of the compilation process can introduce references to APIs that do not exist in the selected LOCAL_MIN_SDK_VERSION without causing problems. Support library worked around this by effectively making the "compile sdk version" "current" when running proguard if support library was in the direct dependency list. Extend the support library hack everywhere, and always use "current" or the full bootclasspath when running proguard. Test: m checkbuild Change-Id: Iaf5853361767f0ea3e9ad4ec908aadd72d639c79
2017-10-21 04:16:41 +02:00
$(filter-out $(my_proguard_sdk_raise), \
Remove duplication of bootclasspath in LOCAL_JAVA_LIBRARIES The bootclasspath libraries have direct dependencies now, so remove them from LOCAL_JAVA_LIBRARIES so they don't also end up in the classpath. Test: m -j checkbuild Test: m -j ANDROID_COMPILE_WITH_JACK=true java Test: manually inspection of build-${TARGET_PRODUCT}.ninja only has expected changes Test: no changes to system.img Change-Id: Icbc8987468f237aa351708b33c3abe5ea3d1816e
2017-09-24 04:52:43 +02:00
$(full_java_bootclasspath_libs) \
$(full_shared_java_header_libs)))
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
Always raise proguard libraries The platform build system doesn't have the concept of a "compile sdk version", it uses the "min sdk version" throughout the compilation process. This means that no stage of the compilation process can introduce references to APIs that do not exist in the selected LOCAL_MIN_SDK_VERSION without causing problems. Support library worked around this by effectively making the "compile sdk version" "current" when running proguard if support library was in the direct dependency list. Extend the support library hack everywhere, and always use "current" or the full bootclasspath when running proguard. Test: m checkbuild Change-Id: Iaf5853361767f0ea3e9ad4ec908aadd72d639c79
2017-10-21 04:16:41 +02:00
legacy_proguard_lib_deps := $(my_proguard_sdk_raise) \
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
$(filter-out $(my_proguard_sdk_raise),$(full_java_bootclasspath_libs) $(full_shared_java_header_libs))
Add support for testing obfuscated app with Jack Bug: 17481317 Bug: 27215871 Bug: 27215868 (cherry picked from commit 505dafb03bdbd9351b5eb8565ac4d8195592ff9a) Change-Id: Ia12fb92585cfcc595eef6cd096d27e779e596f7d
2015-11-03 18:33:21 +01:00
legacy_proguard_flags += -printmapping $(proguard_dictionary)
Keep the collected Proguard configuration This will work for both R8 and Proguard Test: m -j Settings && "manually check .../proguard_coniguration file" Change-Id: I1da7c3426b3511e2d5ad69852da8cec3245d7e54
2018-04-13 15:34:20 +02:00
legacy_proguard_flags += -printconfiguration $(proguard_configuration)
Add support for testing obfuscated app with Jack Bug: 17481317 Bug: 27215871 Bug: 27215868 (cherry picked from commit 505dafb03bdbd9351b5eb8565ac4d8195592ff9a) Change-Id: Ia12fb92585cfcc595eef6cd096d27e779e596f7d
2015-11-03 18:33:21 +01:00
Initialize common_proguard_flags for each module Id938aa35e87c9c69769a3184dfea06fd02299688 removed the initial assignment to common_proguard_flags, which both makes it grow as each module is parsed and also turns it into a lazily evaluated variable. That causes the flags passed to R8 to be the flags computed for the current module multiplied by the number of previously parsed modules. Fixes: 146150575 Test: m checkbuild Change-Id: I87c9625496f482896be6867124f2f12ff662cd57
2019-12-14 01:23:11 +01:00
common_proguard_flags :=
Remove LOCAL_PROGUARD_ENABLED := nosystem None of the system options are controversial, and there are no longer any users of nosystem, so remove it. Test: m checkbuild Change-Id: Id1b946d83688d266ca2942c02c97e8b404c3755b
2017-12-28 18:43:41 +01:00
common_proguard_flag_files := $(BUILD_SYSTEM)/proguard.flags
Make it easier to enable obfuscation and optimization. With this change, use: * LOCAL_PROGUARD_ENABLED := obfuscation # to enable obfuscation * LOCAL_PROGUARD_ENABLED := optimization # to enable optimization * LOCAL_PROGUARD_ENABLED := obfuscation optimization # to enable both Now the meaning of the LOCAL_PROGUARD_ENABLED options: * full: Use the build system's default configurations: with shrink but no obfuscation or optimization, global proguard flags in build/core/proguard.flags are applied. * custom: The same as "full" except no aapt-generated resource-related proguard flags. * nosystem: Don't use any build system's default configurations; but aapt-generated proguard flags are still applied. You are responsible for any other flags. * disabled: Disable proguard. * obfuscation: The same as "full" but with obfuscation enabled. * optimization: The same as "full" but with optimization enabled. * no value (the default): The build system chooses the proper value: "full" if it's an app; "disabled" if it's a library. You can use more than 1 of them in a meaningful combination, for example: LOCAL_PROGUARD_ENABLED := obfuscation optimization Bug: 10307372 Change-Id: Id248caca3048e99547f16559fae74f4afe85c354
2013-08-22 03:32:49 +02:00
ifneq ($(LOCAL_INSTRUMENTATION_FOR)$(filter tests,$(LOCAL_MODULE_TAGS)),)
Compile using Jack. This allows to compile dex targeted java sources using Jack and Jill. Default is still to compile with the legacy toolchain. Default can be switched to the new toolchain by setting environement variable: export ANDROID_COMPILE_WITH_JACK=true Toolchain can also be forced for one module by defining LOCAL_USE_JACK:=true # false in the mk portion defining the module. Jack execution environement can be controlled with: Global variable ANDROID_JACK_VM allow to change the jvm executing Jack. Global variable ANDROID_JACK_VM_ARGS allows to change default args given to the jvm. Global variable ANDROID_JACK_EXTRA_ARGS allows to define some default args to give to Jack LOCAL_JACK_VM_ARGS allows to override default args given to the jvm for the module. LOCAL_JACK_EXTRA_ARGS allows to override default args passed to Jack. Change-Id: Ib81a0fd5f86a51d1e0edbb81cc791d828a05dd29
2014-09-08 14:45:14 +02:00
common_proguard_flags += -dontshrink # don't shrink tests by default
Fix and enable proguard on packages.
2010-02-01 18:51:23 +01:00
endif # test package
Export proguard flags from static android libraries and aar prebuilts Test: m Contacts, classes-proguard.jar has same contents Test: rm -rf out; tapas Contacts; m Change-Id: Id7a92fb2c44913bccbfcbeae127355b4de588e4d
2017-11-17 22:11:26 +01:00
ifneq ($(LOCAL_PROGUARD_ENABLED),custom)
Remove AAPT1 support AAPT2 is used everywhere now, remove support for AAPT1. Also removes dpi_specific_apk.mk, it was never updated to use AAPT2 and has been generating bad APKs (resource ID mismatch between the dex files and the resources) since AAPT2 was made the default in May 2018 (I9b67fd2a9b3234798b2aac879b5242c2097b3863). Bug: 80450981 Test: m checkbuild Change-Id: I2ff768897360ff866dbae5562455bab22be270f7 Merged-In: I2ff768897360ff866dbae5562455bab22be270f7
2019-02-26 07:21:24 +01:00
common_proguard_flag_files += $(foreach l,$(LOCAL_STATIC_ANDROID_LIBRARIES),\
$(call intermediates-dir-for,JAVA_LIBRARIES,$(l),,COMMON)/export_proguard_flags)
Export proguard flags from static android libraries and aar prebuilts Test: m Contacts, classes-proguard.jar has same contents Test: rm -rf out; tapas Contacts; m Change-Id: Id7a92fb2c44913bccbfcbeae127355b4de588e4d
2017-11-17 22:11:26 +01:00
endif
Add jack's argument files to prerequisites Dex files should be updated when jack-default.args or proguard*.flags are modified. Bug: 27954979 Change-Id: I72a7084302f4ef92a89a8068f03f790dd7acd582
2016-04-07 11:56:42 +02:00
ifneq ($(common_proguard_flag_files),)
common_proguard_flags += $(addprefix -include , $(common_proguard_flag_files))
# This is included from $(BUILD_SYSTEM)/proguard.flags
common_proguard_flag_files += $(BUILD_SYSTEM)/proguard_basic_keeps.flags
endif
Make it easier to enable obfuscation and optimization. With this change, use: * LOCAL_PROGUARD_ENABLED := obfuscation # to enable obfuscation * LOCAL_PROGUARD_ENABLED := optimization # to enable optimization * LOCAL_PROGUARD_ENABLED := obfuscation optimization # to enable both Now the meaning of the LOCAL_PROGUARD_ENABLED options: * full: Use the build system's default configurations: with shrink but no obfuscation or optimization, global proguard flags in build/core/proguard.flags are applied. * custom: The same as "full" except no aapt-generated resource-related proguard flags. * nosystem: Don't use any build system's default configurations; but aapt-generated proguard flags are still applied. You are responsible for any other flags. * disabled: Disable proguard. * obfuscation: The same as "full" but with obfuscation enabled. * optimization: The same as "full" but with optimization enabled. * no value (the default): The build system chooses the proper value: "full" if it's an app; "disabled" if it's a library. You can use more than 1 of them in a meaningful combination, for example: LOCAL_PROGUARD_ENABLED := obfuscation optimization Bug: 10307372 Change-Id: Id248caca3048e99547f16559fae74f4afe85c354
2013-08-22 03:32:49 +02:00
ifeq ($(filter obfuscation,$(LOCAL_PROGUARD_ENABLED)),)
# By default no obfuscation
Compile using Jack. This allows to compile dex targeted java sources using Jack and Jill. Default is still to compile with the legacy toolchain. Default can be switched to the new toolchain by setting environement variable: export ANDROID_COMPILE_WITH_JACK=true Toolchain can also be forced for one module by defining LOCAL_USE_JACK:=true # false in the mk portion defining the module. Jack execution environement can be controlled with: Global variable ANDROID_JACK_VM allow to change the jvm executing Jack. Global variable ANDROID_JACK_VM_ARGS allows to change default args given to the jvm. Global variable ANDROID_JACK_EXTRA_ARGS allows to define some default args to give to Jack LOCAL_JACK_VM_ARGS allows to override default args given to the jvm for the module. LOCAL_JACK_EXTRA_ARGS allows to override default args passed to Jack. Change-Id: Ib81a0fd5f86a51d1e0edbb81cc791d828a05dd29
2014-09-08 14:45:14 +02:00
common_proguard_flags += -dontobfuscate
Make it easier to enable obfuscation and optimization. With this change, use: * LOCAL_PROGUARD_ENABLED := obfuscation # to enable obfuscation * LOCAL_PROGUARD_ENABLED := optimization # to enable optimization * LOCAL_PROGUARD_ENABLED := obfuscation optimization # to enable both Now the meaning of the LOCAL_PROGUARD_ENABLED options: * full: Use the build system's default configurations: with shrink but no obfuscation or optimization, global proguard flags in build/core/proguard.flags are applied. * custom: The same as "full" except no aapt-generated resource-related proguard flags. * nosystem: Don't use any build system's default configurations; but aapt-generated proguard flags are still applied. You are responsible for any other flags. * disabled: Disable proguard. * obfuscation: The same as "full" but with obfuscation enabled. * optimization: The same as "full" but with optimization enabled. * no value (the default): The build system chooses the proper value: "full" if it's an app; "disabled" if it's a library. You can use more than 1 of them in a meaningful combination, for example: LOCAL_PROGUARD_ENABLED := obfuscation optimization Bug: 10307372 Change-Id: Id248caca3048e99547f16559fae74f4afe85c354
2013-08-22 03:32:49 +02:00
endif # No obfuscation
ifeq ($(filter optimization,$(LOCAL_PROGUARD_ENABLED)),)
# By default no optimization
Compile using Jack. This allows to compile dex targeted java sources using Jack and Jill. Default is still to compile with the legacy toolchain. Default can be switched to the new toolchain by setting environement variable: export ANDROID_COMPILE_WITH_JACK=true Toolchain can also be forced for one module by defining LOCAL_USE_JACK:=true # false in the mk portion defining the module. Jack execution environement can be controlled with: Global variable ANDROID_JACK_VM allow to change the jvm executing Jack. Global variable ANDROID_JACK_VM_ARGS allows to change default args given to the jvm. Global variable ANDROID_JACK_EXTRA_ARGS allows to define some default args to give to Jack LOCAL_JACK_VM_ARGS allows to override default args given to the jvm for the module. LOCAL_JACK_EXTRA_ARGS allows to override default args passed to Jack. Change-Id: Ib81a0fd5f86a51d1e0edbb81cc791d828a05dd29
2014-09-08 14:45:14 +02:00
common_proguard_flags += -dontoptimize
Make it easier to enable obfuscation and optimization. With this change, use: * LOCAL_PROGUARD_ENABLED := obfuscation # to enable obfuscation * LOCAL_PROGUARD_ENABLED := optimization # to enable optimization * LOCAL_PROGUARD_ENABLED := obfuscation optimization # to enable both Now the meaning of the LOCAL_PROGUARD_ENABLED options: * full: Use the build system's default configurations: with shrink but no obfuscation or optimization, global proguard flags in build/core/proguard.flags are applied. * custom: The same as "full" except no aapt-generated resource-related proguard flags. * nosystem: Don't use any build system's default configurations; but aapt-generated proguard flags are still applied. You are responsible for any other flags. * disabled: Disable proguard. * obfuscation: The same as "full" but with obfuscation enabled. * optimization: The same as "full" but with optimization enabled. * no value (the default): The build system chooses the proper value: "full" if it's an app; "disabled" if it's a library. You can use more than 1 of them in a meaningful combination, for example: LOCAL_PROGUARD_ENABLED := obfuscation optimization Bug: 10307372 Change-Id: Id248caca3048e99547f16559fae74f4afe85c354
2013-08-22 03:32:49 +02:00
endif # No optimization
ifdef LOCAL_INSTRUMENTATION_FOR
ifeq ($(filter obfuscation,$(LOCAL_PROGUARD_ENABLED)),)
# If no obfuscation, link in the instrmented package's classes.jar as a library.
# link_instr_classes_jar is defined in base_rule.mk
Compile using Jack. This allows to compile dex targeted java sources using Jack and Jill. Default is still to compile with the legacy toolchain. Default can be switched to the new toolchain by setting environement variable: export ANDROID_COMPILE_WITH_JACK=true Toolchain can also be forced for one module by defining LOCAL_USE_JACK:=true # false in the mk portion defining the module. Jack execution environement can be controlled with: Global variable ANDROID_JACK_VM allow to change the jvm executing Jack. Global variable ANDROID_JACK_VM_ARGS allows to change default args given to the jvm. Global variable ANDROID_JACK_EXTRA_ARGS allows to define some default args to give to Jack LOCAL_JACK_VM_ARGS allows to override default args given to the jvm for the module. LOCAL_JACK_EXTRA_ARGS allows to override default args passed to Jack. Change-Id: Ib81a0fd5f86a51d1e0edbb81cc791d828a05dd29
2014-09-08 14:45:14 +02:00
legacy_proguard_flags += -libraryjars $(link_instr_classes_jar)
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
legacy_proguard_lib_deps += $(link_instr_classes_jar)
Make it easier to enable obfuscation and optimization. With this change, use: * LOCAL_PROGUARD_ENABLED := obfuscation # to enable obfuscation * LOCAL_PROGUARD_ENABLED := optimization # to enable optimization * LOCAL_PROGUARD_ENABLED := obfuscation optimization # to enable both Now the meaning of the LOCAL_PROGUARD_ENABLED options: * full: Use the build system's default configurations: with shrink but no obfuscation or optimization, global proguard flags in build/core/proguard.flags are applied. * custom: The same as "full" except no aapt-generated resource-related proguard flags. * nosystem: Don't use any build system's default configurations; but aapt-generated proguard flags are still applied. You are responsible for any other flags. * disabled: Disable proguard. * obfuscation: The same as "full" but with obfuscation enabled. * optimization: The same as "full" but with optimization enabled. * no value (the default): The build system chooses the proper value: "full" if it's an app; "disabled" if it's a library. You can use more than 1 of them in a meaningful combination, for example: LOCAL_PROGUARD_ENABLED := obfuscation optimization Bug: 10307372 Change-Id: Id248caca3048e99547f16559fae74f4afe85c354
2013-08-22 03:32:49 +02:00
else # obfuscation
# If obfuscation is enabled, the main app must be obfuscated too.
# We need to run obfuscation using the main app's dictionary,
# and treat the main app's class.jar as injars instead of libraryjars.
Compile using Jack. This allows to compile dex targeted java sources using Jack and Jill. Default is still to compile with the legacy toolchain. Default can be switched to the new toolchain by setting environement variable: export ANDROID_COMPILE_WITH_JACK=true Toolchain can also be forced for one module by defining LOCAL_USE_JACK:=true # false in the mk portion defining the module. Jack execution environement can be controlled with: Global variable ANDROID_JACK_VM allow to change the jvm executing Jack. Global variable ANDROID_JACK_VM_ARGS allows to change default args given to the jvm. Global variable ANDROID_JACK_EXTRA_ARGS allows to define some default args to give to Jack LOCAL_JACK_VM_ARGS allows to override default args given to the jvm for the module. LOCAL_JACK_EXTRA_ARGS allows to override default args passed to Jack. Change-Id: Ib81a0fd5f86a51d1e0edbb81cc791d828a05dd29
2014-09-08 14:45:14 +02:00
legacy_proguard_flags := -injars $(link_instr_classes_jar) \
Make it easier to enable obfuscation and optimization. With this change, use: * LOCAL_PROGUARD_ENABLED := obfuscation # to enable obfuscation * LOCAL_PROGUARD_ENABLED := optimization # to enable optimization * LOCAL_PROGUARD_ENABLED := obfuscation optimization # to enable both Now the meaning of the LOCAL_PROGUARD_ENABLED options: * full: Use the build system's default configurations: with shrink but no obfuscation or optimization, global proguard flags in build/core/proguard.flags are applied. * custom: The same as "full" except no aapt-generated resource-related proguard flags. * nosystem: Don't use any build system's default configurations; but aapt-generated proguard flags are still applied. You are responsible for any other flags. * disabled: Disable proguard. * obfuscation: The same as "full" but with obfuscation enabled. * optimization: The same as "full" but with optimization enabled. * no value (the default): The build system chooses the proper value: "full" if it's an app; "disabled" if it's a library. You can use more than 1 of them in a meaningful combination, for example: LOCAL_PROGUARD_ENABLED := obfuscation optimization Bug: 10307372 Change-Id: Id248caca3048e99547f16559fae74f4afe85c354
2013-08-22 03:32:49 +02:00
-outjars $(intermediates.COMMON)/proguard.$(LOCAL_INSTRUMENTATION_FOR).jar \
-include $(link_instr_intermediates_dir.COMMON)/proguard_options \
-applymapping $(link_instr_intermediates_dir.COMMON)/proguard_dictionary \
-verbose \
Compile using Jack. This allows to compile dex targeted java sources using Jack and Jill. Default is still to compile with the legacy toolchain. Default can be switched to the new toolchain by setting environement variable: export ANDROID_COMPILE_WITH_JACK=true Toolchain can also be forced for one module by defining LOCAL_USE_JACK:=true # false in the mk portion defining the module. Jack execution environement can be controlled with: Global variable ANDROID_JACK_VM allow to change the jvm executing Jack. Global variable ANDROID_JACK_VM_ARGS allows to change default args given to the jvm. Global variable ANDROID_JACK_EXTRA_ARGS allows to define some default args to give to Jack LOCAL_JACK_VM_ARGS allows to override default args given to the jvm for the module. LOCAL_JACK_EXTRA_ARGS allows to override default args passed to Jack. Change-Id: Ib81a0fd5f86a51d1e0edbb81cc791d828a05dd29
2014-09-08 14:45:14 +02:00
$(legacy_proguard_flags)
Fix dependencies for obfuscated instrumentation tests This path is never used, otherwise the dependency on proguard.classes.jar would have triggered the checkbuild dangling rules errors. Remove the dependency on the proguarded classes, which don't exist any more, and depend on the proguard_options and proguard_dictionary files instead. Test: none Change-Id: Ia3ebc3bc71f0d6fdfa4a7a6850e2f7021adfdd1a
2018-07-25 22:40:05 +02:00
legacy_proguard_lib_deps += \
$(link_instr_classes_jar) \
$(link_instr_intermediates_dir.COMMON)/proguard_options \
$(link_instr_intermediates_dir.COMMON)/proguard_dictionary \
Make it easier to enable obfuscation and optimization. With this change, use: * LOCAL_PROGUARD_ENABLED := obfuscation # to enable obfuscation * LOCAL_PROGUARD_ENABLED := optimization # to enable optimization * LOCAL_PROGUARD_ENABLED := obfuscation optimization # to enable both Now the meaning of the LOCAL_PROGUARD_ENABLED options: * full: Use the build system's default configurations: with shrink but no obfuscation or optimization, global proguard flags in build/core/proguard.flags are applied. * custom: The same as "full" except no aapt-generated resource-related proguard flags. * nosystem: Don't use any build system's default configurations; but aapt-generated proguard flags are still applied. You are responsible for any other flags. * disabled: Disable proguard. * obfuscation: The same as "full" but with obfuscation enabled. * optimization: The same as "full" but with optimization enabled. * no value (the default): The build system chooses the proper value: "full" if it's an app; "disabled" if it's a library. You can use more than 1 of them in a meaningful combination, for example: LOCAL_PROGUARD_ENABLED := obfuscation optimization Bug: 10307372 Change-Id: Id248caca3048e99547f16559fae74f4afe85c354
2013-08-22 03:32:49 +02:00
# Sometimes (test + main app) uses different keep rules from the main app -
# apply the main app's dictionary anyway.
Compile using Jack. This allows to compile dex targeted java sources using Jack and Jill. Default is still to compile with the legacy toolchain. Default can be switched to the new toolchain by setting environement variable: export ANDROID_COMPILE_WITH_JACK=true Toolchain can also be forced for one module by defining LOCAL_USE_JACK:=true # false in the mk portion defining the module. Jack execution environement can be controlled with: Global variable ANDROID_JACK_VM allow to change the jvm executing Jack. Global variable ANDROID_JACK_VM_ARGS allows to change default args given to the jvm. Global variable ANDROID_JACK_EXTRA_ARGS allows to define some default args to give to Jack LOCAL_JACK_VM_ARGS allows to override default args given to the jvm for the module. LOCAL_JACK_EXTRA_ARGS allows to override default args passed to Jack. Change-Id: Ib81a0fd5f86a51d1e0edbb81cc791d828a05dd29
2014-09-08 14:45:14 +02:00
legacy_proguard_flags += -ignorewarnings
Make it easier to enable obfuscation and optimization. With this change, use: * LOCAL_PROGUARD_ENABLED := obfuscation # to enable obfuscation * LOCAL_PROGUARD_ENABLED := optimization # to enable optimization * LOCAL_PROGUARD_ENABLED := obfuscation optimization # to enable both Now the meaning of the LOCAL_PROGUARD_ENABLED options: * full: Use the build system's default configurations: with shrink but no obfuscation or optimization, global proguard flags in build/core/proguard.flags are applied. * custom: The same as "full" except no aapt-generated resource-related proguard flags. * nosystem: Don't use any build system's default configurations; but aapt-generated proguard flags are still applied. You are responsible for any other flags. * disabled: Disable proguard. * obfuscation: The same as "full" but with obfuscation enabled. * optimization: The same as "full" but with optimization enabled. * no value (the default): The build system chooses the proper value: "full" if it's an app; "disabled" if it's a library. You can use more than 1 of them in a meaningful combination, for example: LOCAL_PROGUARD_ENABLED := obfuscation optimization Bug: 10307372 Change-Id: Id248caca3048e99547f16559fae74f4afe85c354
2013-08-22 03:32:49 +02:00
endif # no obfuscation
endif # LOCAL_INSTRUMENTATION_FOR
Add the ability to turn on proguard for java targets, and to call aapt to generate a rules file for proguard for stuff from the manifest and other resources that need to be kept.
2009-08-30 22:39:24 +02:00
Separate out Proguard flag files to fix dependency. Bug: 3048005 Change-Id: I3e77ca1082cf7c92a43b249e5c887e3fbdf4ba11
2010-09-29 23:50:41 +02:00
proguard_flag_files := $(addprefix $(LOCAL_PATH)/, $(LOCAL_PROGUARD_FLAG_FILES))
Added support for using R8 instead of Proguard + dx With this change building with USE_R8=true will run R8 instead of Proguard + dx for all targets that have LOCAL_PROGUARD_ENABLED set. R8 (through the compatproguard wrapper) will use the same options as Proguard for now. Additional Proguard configurations for R8 can be added using LOCAL_R8_FLAG_FILES on individual targets. This makes it possible to make configuration updates without touching the Proguard + dx configuration Test: m -j Test: m -j USE_D8=true USE_R8=true Test: m -j USE_D8=true USE_R8=false Test: m -j USE_D8=true Change-Id: I78e8a0fd17cc5cefedccffe95b93c94a60a727f1
2017-10-12 16:09:13 +02:00
proguard_flag_files += $(addprefix $(LOCAL_PATH)/, $(LOCAL_R8_FLAG_FILES))
Separate out Proguard flag files to fix dependency. Bug: 3048005 Change-Id: I3e77ca1082cf7c92a43b249e5c887e3fbdf4ba11
2010-09-29 23:50:41 +02:00
LOCAL_PROGUARD_FLAGS += $(addprefix -include , $(proguard_flag_files))
Add dependencies for files in LOCAL_PROGUARD_FLAGS Do this by introducing a new LOCAL_PROGUARD_FLAGS_DEPS variable that we can modify anytime we add a file reference to LOCAL_PROGUARD_FLAGS. An alternative would have been to switch to LOCAL_PROGUARD_FLAG_FILES, but that would have been much harder to ensure the same command line ordering. Bug: 130111713 Test: treehugger Change-Id: If367197b30d563e0796f0cafa00be1f275f2c406
2019-08-09 18:14:45 +02:00
LOCAL_PROGUARD_FLAGS_DEPS += $(proguard_flag_files)
proguard_flag_files :=
Separate out Proguard flag files to fix dependency. Bug: 3048005 Change-Id: I3e77ca1082cf7c92a43b249e5c887e3fbdf4ba11
2010-09-29 23:50:41 +02:00
Allow proguarding the main app and the test app in a single run. Bug: 12895101 Change-Id: I6804d73306a164d3e3ec0cab4743f9582b5ef2cf
2014-02-07 16:18:59 +01:00
ifdef LOCAL_TEST_MODULE_TO_PROGUARD_WITH
extra_input_jar := $(call intermediates-dir-for,APPS,$(LOCAL_TEST_MODULE_TO_PROGUARD_WITH),,COMMON)/classes.jar
else
extra_input_jar :=
endif
Filter JUnit and android.test classes from applications using proguard The new javac/desugar/proguard/dx based toolchain can fail if there are duplicate classes in the -injars and -libraryjars passed to proguard. That causes problems for b/30188076 which is attempting to remove various junit and android.test classes from the API because it requires the changes to add those classes statically to applications are submitted simultaneously with the change to remove the classes from the API which is not feasible. This change simply causes Proguard to ignore the classes from the application JAR so it will always use them from the library. That allows the changes to be done separately and only requires that this change is reverted simultaneously with the change to update the API. Bug: 30188076 Test: make checkbuild and make -j ANDROID_FORCE_JACK_ENABLED=disabled checkbuild Change-Id: I6ed6c45a159d6261d90245551aa2913cc82d2e8b
2017-02-21 14:11:13 +01:00
Only define proguard dictionary as output if obfuscating If we're not obfuscating, proguard doesn't generate the mapping file, and ninja will consider the edge dirty, since one of the output files does not exist. Also disable it for jack, since jack writes to a different file. Bug: 66929996 Test: m cts; m cts Test: m ahat-test with a clean build Change-Id: Iff6707c44cbd86cd9328bbad8322398bc9d960fd
2017-09-26 08:36:19 +02:00
ifneq ($(filter obfuscation,$(LOCAL_PROGUARD_ENABLED)),)
Keep the collected Proguard configuration This will work for both R8 and Proguard Test: m -j Settings && "manually check .../proguard_coniguration file" Change-Id: I1da7c3426b3511e2d5ad69852da8cec3245d7e54
2018-04-13 15:34:20 +02:00
$(built_dex_intermediate): .KATI_IMPLICIT_OUTPUTS := $(proguard_dictionary) $(proguard_configuration)
Package jacoco and proguard files out of a PACKAGING directory Package jacoco-report-classes.jar, proguard_usage.zip and proguard_dictionary out of directories in $OUT/obj/PACKAGING so that they get cleared by m installclean. This will make incremental builds that package these files accurate as long as installclean was run, which is much faster than a full clean build. Bug: 184583915 Test: m TARGET_BUILD_APPS=DeskClock EMMA_INSTRUMENT=true dist Change-Id: I60c6a0fec1fbce26eab8d5adab25a2231b48e251
2021-04-07 03:04:06 +02:00
# Make a rule to copy the proguard_dictionary to a packaging directory.
$(eval $(call copy-one-file,$(proguard_dictionary),\
$(call local-packaging-dir,proguard_dictionary)/proguard_dictionary))
$(call add-dependency,$(LOCAL_BUILT_MODULE),\
$(call local-packaging-dir,proguard_dictionary)/proguard_dictionary)
$(eval $(call copy-one-file,$(full_classes_pre_proguard_jar),\
$(call local-packaging-dir,proguard_dictionary)/classes.jar))
$(call add-dependency,$(LOCAL_BUILT_MODULE),\
$(call local-packaging-dir,proguard_dictionary)/classes.jar)
Define proguard dictionary output for R8 When running with R8 instead of Proguard + dx the proguard mapping is produced together with the dex output. Bug: 68249935 Test: m -j ahat-test Change-Id: Ica5ef455eb3bd1eabe55c43e9e026f47cadace1c
2017-10-25 17:10:59 +02:00
endif
Fix and enable proguard on packages.
2010-02-01 18:51:23 +01:00
Make it easier to enable obfuscation and optimization. With this change, use: * LOCAL_PROGUARD_ENABLED := obfuscation # to enable obfuscation * LOCAL_PROGUARD_ENABLED := optimization # to enable optimization * LOCAL_PROGUARD_ENABLED := obfuscation optimization # to enable both Now the meaning of the LOCAL_PROGUARD_ENABLED options: * full: Use the build system's default configurations: with shrink but no obfuscation or optimization, global proguard flags in build/core/proguard.flags are applied. * custom: The same as "full" except no aapt-generated resource-related proguard flags. * nosystem: Don't use any build system's default configurations; but aapt-generated proguard flags are still applied. You are responsible for any other flags. * disabled: Disable proguard. * obfuscation: The same as "full" but with obfuscation enabled. * optimization: The same as "full" but with optimization enabled. * no value (the default): The build system chooses the proper value: "full" if it's an app; "disabled" if it's a library. You can use more than 1 of them in a meaningful combination, for example: LOCAL_PROGUARD_ENABLED := obfuscation optimization Bug: 10307372 Change-Id: Id248caca3048e99547f16559fae74f4afe85c354
2013-08-22 03:32:49 +02:00
endif # LOCAL_PROGUARD_ENABLED defined
Fix duplicate and dangling rules I6730e2d3ec38004874265b2a690442dec57b33f4 introduced duplicate rules to build classes.jar for static java library prebuilts, and left rules to copy $(built_dex_intermediates) to $(built_dex) for modules that don't build dex files. Move prebuilts LOCAL_BUILT_MODULE back to javalib.jar to match non-prebuilt modules, and remove the manual building of javalib.jar. Add a check around $(built_dex_intermediates) for static java libraries. Bug: 36901093 Test: m -j ANDROID_COMPILE_WITH_JACK=false Change-Id: I291510b56162f0d35553e3c7ccd59b1382224d62
2017-04-06 18:56:19 +02:00
ifneq ($(LOCAL_IS_STATIC_JAVA_LIBRARY),true)
Re-enable dx support This is a partial revert of commits: 858657366fa6 Remove support of disabling Jack. 3ae78612522e Remove javac support in host dex rules. 22313f2b2a4a Remove rules for building dex with dx Test: builds Change-Id: Ie12d743cbe978bdeb030910848b67f5945a4fec8
2016-12-21 23:29:13 +01:00
$(built_dex_intermediate): PRIVATE_DX_FLAGS := $(LOCAL_DX_FLAGS)
Added support for using R8 instead of Proguard + dx With this change building with USE_R8=true will run R8 instead of Proguard + dx for all targets that have LOCAL_PROGUARD_ENABLED set. R8 (through the compatproguard wrapper) will use the same options as Proguard for now. Additional Proguard configurations for R8 can be added using LOCAL_R8_FLAG_FILES on individual targets. This makes it possible to make configuration updates without touching the Proguard + dx configuration Test: m -j Test: m -j USE_D8=true USE_R8=true Test: m -j USE_D8=true USE_R8=false Test: m -j USE_D8=true Change-Id: I78e8a0fd17cc5cefedccffe95b93c94a60a727f1
2017-10-12 16:09:13 +02:00
ifdef LOCAL_PROGUARD_ENABLED
Put javac, d8 and r8 rules into RBE ninja pool javac, d8 and r8 rules for module defined in Android.mk files are running remotely with RBE but are running in the local ninja pool, restricting them to only running as many jobs in parallel as there are local CPUs. Set the ninja pool to let them run 500 jobs in parallel. Bug: 228603472 Test: m checkbuild Change-Id: I60f7859f3657fc1eff0daf0e0a1b0f9fe63551b6
2022-04-08 19:52:08 +02:00
$(built_dex_intermediate): .KATI_NINJA_POOL := $(R8_NINJA_POOL)
Remove proguard support R8 is always used now. Bug: 111885749 Test: m checkbuild Change-Id: I9ae586c6360f2e3050422090b4e08f27ae167758
2018-07-25 22:41:42 +02:00
$(built_dex_intermediate): PRIVATE_EXTRA_INPUT_JAR := $(extra_input_jar)
$(built_dex_intermediate): PRIVATE_PROGUARD_FLAGS := $(legacy_proguard_flags) $(common_proguard_flags) $(LOCAL_PROGUARD_FLAGS)
Ensure that the R8 minification map (ProGuard dictionary) file exists R8 no longer outputs an empty map file when minification (obfuscation) is turned off. Test: m -j PRODUCT-aosp_x86-eng Change-Id: I3bd3f2900225dca05a972f46a3b882041e17ba49
2018-08-23 11:17:17 +02:00
$(built_dex_intermediate): PRIVATE_PROGUARD_DICTIONARY := $(proguard_dictionary)
Add dependencies for files in LOCAL_PROGUARD_FLAGS Do this by introducing a new LOCAL_PROGUARD_FLAGS_DEPS variable that we can modify anytime we add a file reference to LOCAL_PROGUARD_FLAGS. An alternative would have been to switch to LOCAL_PROGUARD_FLAG_FILES, but that would have been much harder to ensure the same command line ordering. Bug: 130111713 Test: treehugger Change-Id: If367197b30d563e0796f0cafa00be1f275f2c406
2019-08-09 18:14:45 +02:00
$(built_dex_intermediate) : $(full_classes_pre_proguard_jar) $(extra_input_jar) $(my_proguard_sdk_raise) $(common_proguard_flag_files) $(legacy_proguard_lib_deps) $(R8_COMPAT_PROGUARD) $(LOCAL_PROGUARD_FLAGS_DEPS)
Added support for using R8 instead of Proguard + dx With this change building with USE_R8=true will run R8 instead of Proguard + dx for all targets that have LOCAL_PROGUARD_ENABLED set. R8 (through the compatproguard wrapper) will use the same options as Proguard for now. Additional Proguard configurations for R8 can be added using LOCAL_R8_FLAG_FILES on individual targets. This makes it possible to make configuration updates without touching the Proguard + dx configuration Test: m -j Test: m -j USE_D8=true USE_R8=true Test: m -j USE_D8=true USE_R8=false Test: m -j USE_D8=true Change-Id: I78e8a0fd17cc5cefedccffe95b93c94a60a727f1
2017-10-12 16:09:13 +02:00
$(transform-jar-to-dex-r8)
Remove proguard support R8 is always used now. Bug: 111885749 Test: m checkbuild Change-Id: I9ae586c6360f2e3050422090b4e08f27ae167758
2018-07-25 22:41:42 +02:00
else # !LOCAL_PROGUARD_ENABLED
Put javac, d8 and r8 rules into RBE ninja pool javac, d8 and r8 rules for module defined in Android.mk files are running remotely with RBE but are running in the local ninja pool, restricting them to only running as many jobs in parallel as there are local CPUs. Set the ninja pool to let them run 500 jobs in parallel. Bug: 228603472 Test: m checkbuild Change-Id: I60f7859f3657fc1eff0daf0e0a1b0f9fe63551b6
2022-04-08 19:52:08 +02:00
$(built_dex_intermediate): .KATI_NINJA_POOL := $(D8_NINJA_POOL)
Pass classpath to d8 d8 requires the full classpath if --min-api requires default method or try-with-resources desugaring. Always pass the full classpath, since it will already have been built to generate the input jar. Bug: 116243313 Test: m checkbuild Change-Id: I363b4d3145e23d4eed77455c1897430206f3ac22
2018-09-21 21:36:53 +02:00
$(built_dex_intermediate): PRIVATE_D8_LIBS := $(full_java_bootclasspath_libs) $(full_shared_java_header_libs)
$(built_dex_intermediate): $(full_java_bootclasspath_libs) $(full_shared_java_header_libs)
Remove proguard support R8 is always used now. Bug: 111885749 Test: m checkbuild Change-Id: I9ae586c6360f2e3050422090b4e08f27ae167758
2018-07-25 22:41:42 +02:00
$(built_dex_intermediate): $(full_classes_pre_proguard_jar) $(DX) $(ZIP2ZIP)
Re-enable dx support This is a partial revert of commits: 858657366fa6 Remove support of disabling Jack. 3ae78612522e Remove javac support in host dex rules. 22313f2b2a4a Remove rules for building dex with dx Test: builds Change-Id: Ie12d743cbe978bdeb030910848b67f5945a4fec8
2016-12-21 23:29:13 +01:00
$(transform-classes.jar-to-dex)
Added support for using R8 instead of Proguard + dx With this change building with USE_R8=true will run R8 instead of Proguard + dx for all targets that have LOCAL_PROGUARD_ENABLED set. R8 (through the compatproguard wrapper) will use the same options as Proguard for now. Additional Proguard configurations for R8 can be added using LOCAL_R8_FLAG_FILES on individual targets. This makes it possible to make configuration updates without touching the Proguard + dx configuration Test: m -j Test: m -j USE_D8=true USE_R8=true Test: m -j USE_D8=true USE_R8=false Test: m -j USE_D8=true Change-Id: I78e8a0fd17cc5cefedccffe95b93c94a60a727f1
2017-10-12 16:09:13 +02:00
endif
Re-enable dx support This is a partial revert of commits: 858657366fa6 Remove support of disabling Jack. 3ae78612522e Remove javac support in host dex rules. 22313f2b2a4a Remove rules for building dex with dx Test: builds Change-Id: Ie12d743cbe978bdeb030910848b67f5945a4fec8
2016-12-21 23:29:13 +01:00
Use two-column format for PRODUCT_BOOT_JARS components. The first component is the apex name, or a special name "platform" if the boot jar is a platform jar rather than a part of some apex. This is a prerequisite change for moving core-icu4j to a separate com.android.i18n apex. Old one-column format is still supported, but all unqualified components of PRODUCT_BOOT_JARS get "platform:" prepended to them after reading the product makefiles. Test: aosp_walleye-userdebug boots Bug: 138994281 Change-Id: I0f79c7d10477880ca65354251a5d1ca0b7ce79ab
2020-04-30 11:59:48 +02:00
$(foreach pair,$(PRODUCT_BOOT_JARS), \
$(if $(filter $(LOCAL_MODULE),$(call word-colon,2,$(pair))), \
$(call pretty-error,Modules in PRODUCT_BOOT_JARS must be defined in Android.bp files)))
Move hiddenapi singleton rules to Soong Hiddenapi rules are now in build/soong/java/hiddenapi_singleton.go. This effectively requires any module in PRODUCT_BOOT_JARS to be defined in Soong. Bug: 123645297 Test: m checkbuild Change-Id: If72bd1c20b2014d0a3d400624d37fdb0a3052245
2019-02-05 00:28:51 +01:00
$(built_dex): $(built_dex_intermediate)
enhancement for building app with emma code coverage * global filter to avoid applying instrumentation on emma classes * remove local variable information at dex step instead of compile time Change-Id: If04c27bc717f34816077a98ead9ceb0dbcbb0d2f
2010-03-11 00:48:03 +01:00
@echo Copying: $@
Support dx generating multiple dex files. Dx is now capable of generating multiple dex file in one run. This capability is not compatible with --output=*.dex so this CL changes the --output argument to be a directory. This CL also includes the packaging of the multiple dex files when dx generates more than one dex file. Change-Id: I1ddc91b416de5929d4d4b41824c6012b32f94deb
2013-08-20 17:05:27 +02:00
$(hide) mkdir -p $(dir $@)
$(hide) rm -f $(dir $@)/classes*.dex
Optimize out extra jar copies Don't copy jar files for disabled stages. Instead, set the name of the output to the name of the input so the next stage will directly pick up the output of the previous stage. Test: m -j ANDROID_COMPILE_WITH_JACK=false java Change-Id: Ib7268cbff7ea7ff2ad2caf994aa145e1b7a12b83
2017-03-29 21:17:36 +02:00
$(hide) cp -fp $(dir $<)/classes*.dex $(dir $@)
auto import from //depot/cupcake/@135843
2009-03-04 04:28:42 +01:00
Make javac checkbuilds match jack Building all java to dex is very slow. Make javac checkbuilds act like jack checkbuilds and only build to class files for unused modules, and add a java-dex target that can be used to build everything to dex. Test: m -j checkbuild Change-Id: Idcf9c9e0223b9dd88aaa53beb0cb50a230034b0f
2017-04-28 00:05:44 +02:00
java-dex: $(built_dex)
Fix duplicate and dangling rules I6730e2d3ec38004874265b2a690442dec57b33f4 introduced duplicate rules to build classes.jar for static java library prebuilts, and left rules to copy $(built_dex_intermediates) to $(built_dex) for modules that don't build dex files. Move prebuilts LOCAL_BUILT_MODULE back to javalib.jar to match non-prebuilt modules, and remove the manual building of javalib.jar. Add a check around $(built_dex_intermediates) for static java libraries. Bug: 36901093 Test: m -j ANDROID_COMPILE_WITH_JACK=false Change-Id: I291510b56162f0d35553e3c7ccd59b1382224d62
2017-04-06 18:56:19 +02:00
endif # !LOCAL_IS_STATIC_JAVA_LIBRARY
auto import from //depot/cupcake/@135843
2009-03-04 04:28:42 +01:00
findbugs_xml := $(intermediates.COMMON)/findbugs.xml
Add LOCAL_FINDBUGS_FLAGS to support custom findbugs flags. Use LOCAL_FINDBUGS_FLAGS to specify findbugs command line flags. To use findbugs filters: LOCAL_FINDBUGS_FLAGS := -exclude $(LOCAL_PATH)/exclude.xml -include \ $(LOCAL_PATH)/include.xml where exclude.xml and include.xml are filter files. The build system automatically adds the filter files as dependency of findbugs' output xml. Bug: 24948760 Change-Id: I82502c0ade910c5255001fa5f390316137ce0be6
2015-10-21 19:30:51 +02:00
$(findbugs_xml): PRIVATE_AUXCLASSPATH := $(addprefix -auxclasspath ,$(strip \
$(call normalize-path-list,$(filter %.jar,$(full_java_libs)))))
$(findbugs_xml): PRIVATE_FINDBUGS_FLAGS := $(LOCAL_FINDBUGS_FLAGS)
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
$(findbugs_xml) : $(full_classes_pre_proguard_jar) $(filter %.xml, $(LOCAL_FINDBUGS_FLAGS))
auto import from //depot/cupcake/@135843
2009-03-04 04:28:42 +01:00
@echo Findbugs: $@
$(hide) $(FINDBUGS) -textui -effort:min -xml:withMessages \
Add LOCAL_FINDBUGS_FLAGS to support custom findbugs flags. Use LOCAL_FINDBUGS_FLAGS to specify findbugs command line flags. To use findbugs filters: LOCAL_FINDBUGS_FLAGS := -exclude $(LOCAL_PATH)/exclude.xml -include \ $(LOCAL_PATH)/include.xml where exclude.xml and include.xml are filter files. The build system automatically adds the filter files as dependency of findbugs' output xml. Bug: 24948760 Change-Id: I82502c0ade910c5255001fa5f390316137ce0be6
2015-10-21 19:30:51 +02:00
$(PRIVATE_AUXCLASSPATH) $(PRIVATE_FINDBUGS_FLAGS) \
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
$< \
auto import from //depot/cupcake/@135843
2009-03-04 04:28:42 +01:00
> $@
ALL_FINDBUGS_FILES += $(findbugs_xml)
findbugs_html := $(PRODUCT_OUT)/findbugs/$(LOCAL_MODULE).html
$(findbugs_html) : PRIVATE_XML_FILE := $(findbugs_xml)
$(LOCAL_MODULE)-findbugs : $(findbugs_html)
Mark more targets as PHONY So that we can start restricting non-phony targets to $OUT_DIR and $DIST_DIR. Test: add --writable=out/, see fewer warnings Change-Id: I411fe4af732b1bce35d4a4c1e2a47b5f8a15e6b8
2018-07-24 10:21:12 +02:00
.PHONY: $(LOCAL_MODULE)-findbugs
auto import from //depot/cupcake/@135843
2009-03-04 04:28:42 +01:00
$(findbugs_html) : $(findbugs_xml)
@mkdir -p $(dir $@)
Fix makefile to be compatible with findbugs v 1.3.8 modified: core/java.mk
2009-05-13 09:44:59 +02:00
@echo ConvertXmlToText: $@
Fix the path for findbugs. Change-Id: I45485f1aeaf7fc3db2839f42829278d8c0ec97e3
2014-05-20 10:04:16 +02:00
$(hide) $(FINDBUGS_DIR)/convertXmlToText -html:fancy.xsl $(PRIVATE_XML_FILE) \
auto import from //depot/cupcake/@135843
2009-03-04 04:28:42 +01:00
> $@
$(LOCAL_MODULE)-findbugs : $(findbugs_html)
Better handle of need_compile_java. Change-Id: I609a27e2b35b08962243b6516c6c525c0c938d3c
2013-08-28 22:04:46 +02:00
endif # full_classes_jar is defined
Compile using Jack. This allows to compile dex targeted java sources using Jack and Jill. Default is still to compile with the legacy toolchain. Default can be switched to the new toolchain by setting environement variable: export ANDROID_COMPILE_WITH_JACK=true Toolchain can also be forced for one module by defining LOCAL_USE_JACK:=true # false in the mk portion defining the module. Jack execution environement can be controlled with: Global variable ANDROID_JACK_VM allow to change the jvm executing Jack. Global variable ANDROID_JACK_VM_ARGS allows to change default args given to the jvm. Global variable ANDROID_JACK_EXTRA_ARGS allows to define some default args to give to Jack LOCAL_JACK_VM_ARGS allows to override default args given to the jvm for the module. LOCAL_JACK_EXTRA_ARGS allows to override default args passed to Jack. Change-Id: Ib81a0fd5f86a51d1e0edbb81cc791d828a05dd29
2014-09-08 14:45:14 +02:00
Consolidate sdk version handling Share the logic that converts LOCAL_SDK_VERSION, LOCAL_MIN_SDK_VERSION and the global config values into minSdkVersion, targetSdkVersion, and compileSdkVersion. Test: m checkbuild Change-Id: Id038673662b23cffc9e57978ac55a3f35ef8237a
2019-02-07 00:40:03 +01:00
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_DEFAULT_APP_TARGET_SDK := $(call module-target-sdk-version)
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_SDK_VERSION := $(call module-sdk-version)
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_MIN_SDK_VERSION := $(call codename-or-sdk-to-sdk,$(call module-min-sdk-version))
Reference in a new issue Copy permalink