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

226 lines
8.9 KiB
Makefile
Raw Normal View History

auto import from //depot/cupcake/@135843
2009-03-04 04:28:42 +01:00
#
# Copyright (C) 2008 The Android Open Source Project
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
# Standard rules for building a "static" java library.
# Static java libraries are not installed, nor listed on any
# classpaths. They can, however, be included wholesale in
# other java modules.
Record module type statistics Creates a build_system_stats.txt build artifact that contains statistics on how many BUILD_* modules are defined in a build. Also writes out information about the Soong module types sent from the Soong build. Change-Id: Iaf0c7062f542dc6942b5349854f3d49267cac4a5
2016-07-26 01:03:53 +02:00
$(call record-module-type,STATIC_JAVA_LIBRARY)
auto import from //depot/cupcake/@135843
2009-03-04 04:28:42 +01:00
LOCAL_UNINSTALLABLE_MODULE := true
LOCAL_IS_STATIC_JAVA_LIBRARY := true
Allow to run Proguard on static Java library 1. Let aapt output the proguard_options file 2. If proguard is enabled, switch the dependency from $(full_classes_jar) to $(full_classes_proguard_jar). Change-Id: Idc641a1515b8899a4623a2aeec5cd494f6c1c1c5
2013-03-26 20:42:32 +01:00
LOCAL_MODULE_CLASS := JAVA_LIBRARIES
Support to build static Java library with Android resource Bug: 5714516 The rationale behind this change: - the library is compiled into a jar file, but its R class is generated making the constant not constant (static, not final static) (aapt option --non-constant-id). Also the jar file does not contain the R class. - this allows the integer value to not be inlined in the compiled class files. Note that this prevents using switch statements. - the main project use this jar file as a normal static library: it will add all the class files except the R.class. - the main project uses the library res folder as a resource folder with lower priority than the main project (basically the main project is an overlay. This is accomplished using aapt's --auto-add-overlay to handle resources only in the main project (which the normal overlay mechanism doesn't allow). - the main project creates R classes in the main project's package but also in the library's package. This is done with aapt's --extra-packages which accept as many packages as needed, separated by a :. - manifest merging is not done yet, so activities/services/permissions/etc... have to be manually declared in the main app. To use a static library with Android resource in your app, 1. Add the library's resource dir to your app as an overlay: LOCAL_RESOURCE_DIR := <app_resource_dir> <static_library_resource_dirs> 2. Set the proper aapt flags: LOCAL_AAPT_FLAGS := <apps_own_flags> --auto-add-overlay \ --extra-packages <lib1_package_name>:<lib2_package_name>:... Change-Id: Ifb4d2300b952ea4aaee74da1bb0c6c72ea0698a3
2011-12-14 23:29:28 +01:00
Support to build with AAPT2 To build with AAPT2, set "USE_AAPT2=true". TODO: Support split apks and generated resources from other than renderscript. Bug: 25958912 Change-Id: I19b1a038824ce5b2a3d3ffadbce3173c845193fc
2015-12-04 22:59:18 +01:00
intermediates.COMMON := $(call local-intermediates-dir,COMMON)
my_res_package :=
Move support library dependency munging earlier The presence of LOCAL_STATIC_ANDROID_LIBRARIES is used early to decide whether to move resources to overlays, and late to decide whether to add --auto-add-overlay. If support_libraries.mk moves the last LOCAL_STATIC_ANDROID_LIBRARIES value to LOCAL_STATIC_JAVA_LIBRARIES then the resources will be moved to overlays but --auto-add-overlay will not be added, causing aapt2 to fail with: error: resource bool/leanback_outline_clipping_disabled does not override an existing resource. note: define an <add-resource> tag or use --auto-add-overlay. Bug: 79481102 Test: m FORCE_AAPT2=true java Change-Id: Icc67acf23b846bd506a5d397d02ad5775ad0ea1d
2018-05-18 00:05:47 +02:00
# Process Support Library dependencies.
include $(BUILD_SYSTEM)/support_libraries.mk
Allow forcing AAPT2 on Building with FORCE_AAPT2=true will turn on AAPT2 for all modules unless they set LOCAL_USE_AAPT2 := false. The build system will attempt to rewrite common AAPT patterns into AAPT2 patterns, including removing --extra-packages for support library packages, removing LOCAL_RESOURCE_DIR point to support library resources, adding a default empty manifest file if it doesn't exist, and converting LOCAL_STATIC_JAVA_AAR_LIBRARIES to LOCAL_STATIC_ANDROID_LIBRARIES. Bug: 79481102 Test: m checkbuild Change-Id: I8d9d55fe4d5d5c965c64b0407efe74e0afc35c3a
2018-05-09 22:29:51 +02:00
include $(BUILD_SYSTEM)/force_aapt2.mk
Support to build static Java library with Android resource Bug: 5714516 The rationale behind this change: - the library is compiled into a jar file, but its R class is generated making the constant not constant (static, not final static) (aapt option --non-constant-id). Also the jar file does not contain the R class. - this allows the integer value to not be inlined in the compiled class files. Note that this prevents using switch statements. - the main project use this jar file as a normal static library: it will add all the class files except the R.class. - the main project uses the library res folder as a resource folder with lower priority than the main project (basically the main project is an overlay. This is accomplished using aapt's --auto-add-overlay to handle resources only in the main project (which the normal overlay mechanism doesn't allow). - the main project creates R classes in the main project's package but also in the library's package. This is done with aapt's --extra-packages which accept as many packages as needed, separated by a :. - manifest merging is not done yet, so activities/services/permissions/etc... have to be manually declared in the main app. To use a static library with Android resource in your app, 1. Add the library's resource dir to your app as an overlay: LOCAL_RESOURCE_DIR := <app_resource_dir> <static_library_resource_dirs> 2. Set the proper aapt flags: LOCAL_AAPT_FLAGS := <apps_own_flags> --auto-add-overlay \ --extra-packages <lib1_package_name>:<lib2_package_name>:... Change-Id: Ifb4d2300b952ea4aaee74da1bb0c6c72ea0698a3
2011-12-14 23:29:28 +01:00
# Hack to build static Java library with Android resource
# See bug 5714516
all_resources :=
Allow LOCAL_RESOURCE_DIR pointing to dir generated during the build Bug: 15850610 Change-Id: I46b98adb556d8e6bf166761f8bb240006dbe5b14
2014-06-25 22:23:58 +02:00
need_compile_res :=
# A static Java library needs to explicily set LOCAL_RESOURCE_DIR.
Support to build static Java library with Android resource Bug: 5714516 The rationale behind this change: - the library is compiled into a jar file, but its R class is generated making the constant not constant (static, not final static) (aapt option --non-constant-id). Also the jar file does not contain the R class. - this allows the integer value to not be inlined in the compiled class files. Note that this prevents using switch statements. - the main project use this jar file as a normal static library: it will add all the class files except the R.class. - the main project uses the library res folder as a resource folder with lower priority than the main project (basically the main project is an overlay. This is accomplished using aapt's --auto-add-overlay to handle resources only in the main project (which the normal overlay mechanism doesn't allow). - the main project creates R classes in the main project's package but also in the library's package. This is done with aapt's --extra-packages which accept as many packages as needed, separated by a :. - manifest merging is not done yet, so activities/services/permissions/etc... have to be manually declared in the main app. To use a static library with Android resource in your app, 1. Add the library's resource dir to your app as an overlay: LOCAL_RESOURCE_DIR := <app_resource_dir> <static_library_resource_dirs> 2. Set the proper aapt flags: LOCAL_AAPT_FLAGS := <apps_own_flags> --auto-add-overlay \ --extra-packages <lib1_package_name>:<lib2_package_name>:... Change-Id: Ifb4d2300b952ea4aaee74da1bb0c6c72ea0698a3
2011-12-14 23:29:28 +01:00
ifdef LOCAL_RESOURCE_DIR
Allow LOCAL_RESOURCE_DIR pointing to dir generated during the build Bug: 15850610 Change-Id: I46b98adb556d8e6bf166761f8bb240006dbe5b14
2014-06-25 22:23:58 +02:00
need_compile_res := true
Clean LOCAL_RESOURCE_DIR paths With LOCAL_USE_AAPT2, resource directories like a/b/../res cause problems, since ninja will canonicalize the path before creating the intermediate resource directory, so it creates <intermediates>/a/res while we give AAPT2 <intermediates>/a/b/../res, which fails to open. Bug: 37716307 Test: Switch LOCAL_USE_AAPT2:=true for TelecommUnitTests, mma Test: lunch aosp_marlin-userdebug; m -j Change-Id: Id0d167e68185a119390e7b7e3c344895e77ca0e3
2017-05-03 08:55:44 +02:00
LOCAL_RESOURCE_DIR := $(foreach d,$(LOCAL_RESOURCE_DIR),$(call clean-path,$(d)))
Calls aapt2 when a static Java library has LOCAL_STATIC_ANDROID_LIBRARIES We expect to build the module's own packare-res.apk from the LOCAL_STATIC_ANDROID_LIBRARIES in this case. Bug: 25958912 Change-Id: I4d0294c867f5fb636983d630493a3b188279cae9
2016-03-01 21:06:47 +01:00
endif
Support LOCAL_STATIC_JAVA_AAR_LIBRARIES with aapt2 LOCAL_STATIC_JAVA_AAR_LIBRARIES are slightly different from LOCAL_STATIC_ANDROID_LIBRARIES, due to b/78447299 the AndroidManifest.xml from ANDROID libraries are ignored. Temporarily add support for LOCAL_STATIC_JAVA_AAR_LIBRARIES when using LOCAL_USE_AAPT2 := true, treating them the same as LOCAL_STATIC_ANDROID_LIBRARIES except that they are merged by android_manifest.xml Bug: 78447299 Bug: 79481102 Test: m FORCE_AAPT2=true checkbuild Change-Id: Ia6210810c1ea6e776be97ae1c9a586b5de844125
2018-05-23 22:35:53 +02:00
ifneq ($(strip $(LOCAL_STATIC_ANDROID_LIBRARIES) $(LOCAL_STATIC_JAVA_AAR_LIBRARIES)),)
Calls aapt2 when a static Java library has LOCAL_STATIC_ANDROID_LIBRARIES We expect to build the module's own packare-res.apk from the LOCAL_STATIC_ANDROID_LIBRARIES in this case. Bug: 25958912 Change-Id: I4d0294c867f5fb636983d630493a3b188279cae9
2016-03-01 21:06:47 +01:00
need_compile_res := true
endif
Support to build with AAPT2 To build with AAPT2, set "USE_AAPT2=true". TODO: Support split apks and generated resources from other than renderscript. Bug: 25958912 Change-Id: I19b1a038824ce5b2a3d3ffadbce3173c845193fc
2015-12-04 22:59:18 +01:00
Calls aapt2 when a static Java library has LOCAL_STATIC_ANDROID_LIBRARIES We expect to build the module's own packare-res.apk from the LOCAL_STATIC_ANDROID_LIBRARIES in this case. Bug: 25958912 Change-Id: I4d0294c867f5fb636983d630493a3b188279cae9
2016-03-01 21:06:47 +01:00
ifeq ($(need_compile_res),true)
Support to build static Java library with Android resource Bug: 5714516 The rationale behind this change: - the library is compiled into a jar file, but its R class is generated making the constant not constant (static, not final static) (aapt option --non-constant-id). Also the jar file does not contain the R class. - this allows the integer value to not be inlined in the compiled class files. Note that this prevents using switch statements. - the main project use this jar file as a normal static library: it will add all the class files except the R.class. - the main project uses the library res folder as a resource folder with lower priority than the main project (basically the main project is an overlay. This is accomplished using aapt's --auto-add-overlay to handle resources only in the main project (which the normal overlay mechanism doesn't allow). - the main project creates R classes in the main project's package but also in the library's package. This is done with aapt's --extra-packages which accept as many packages as needed, separated by a :. - manifest merging is not done yet, so activities/services/permissions/etc... have to be manually declared in the main app. To use a static library with Android resource in your app, 1. Add the library's resource dir to your app as an overlay: LOCAL_RESOURCE_DIR := <app_resource_dir> <static_library_resource_dirs> 2. Set the proper aapt flags: LOCAL_AAPT_FLAGS := <apps_own_flags> --auto-add-overlay \ --extra-packages <lib1_package_name>:<lib2_package_name>:... Change-Id: Ifb4d2300b952ea4aaee74da1bb0c6c72ea0698a3
2011-12-14 23:29:28 +01:00
all_resources := $(strip \
$(foreach dir, $(LOCAL_RESOURCE_DIR), \
$(addprefix $(dir)/, \
$(patsubst res/%,%, \
$(call find-subdir-assets,$(dir)) \
) \
) \
))
Remove the R/Manifest classes when building the static Java library Bug: 5448433 Instead of deferring the removal to building the app. In that case any R/Manifest classes in any static Java libraries will be deleted, no matter if they are generated from Android resource, or just source R.java/Manifest.java in the source tree by accident. Change-Id: I656f45e3cbc3796c5d4832363231480b3f1dc5b8
2011-12-16 01:36:55 +01:00
More flexibility to keep/remove R.class in static Java library - Usually you don't need to set LOCAL_JAR_EXCLUDE_FILES in your Android.mk, if your static library is directly used by an app. - If your library will be included by another library that need reference the R/Manifest class, you can set LOCAL_JAR_EXCLUDE_FILES := none to keep the generated classes. - If your library includes another static library that has Android resource and you want to remove the generated classes carried by the static library, set: LOCAL_JAR_EXCLUDE_FILES := $(ANDROID_RESOURCE_GENERATED_CLASSES) With the LOCAL_JAR_EXCLUDE_FILES value "none", deprecate the old long variable LOCAL_KEEP_R_CLASS_IN_STATIC_JAVA_LIBRARY. Change-Id: I3b9ad5d66f0262f784feb09bc1537c5b01256258
2012-06-19 19:40:37 +02:00
# By default we should remove the R/Manifest classes from a static Java library,
# because they will be regenerated in the app that uses it.
# But if the static Java library will be used by a library, then we may need to
# keep the generated classes with "LOCAL_JAR_EXCLUDE_FILES := none".
ifndef LOCAL_JAR_EXCLUDE_FILES
LOCAL_JAR_EXCLUDE_FILES := $(ANDROID_RESOURCE_GENERATED_CLASSES)
Support to build static Java library with Android resource Bug: 5714516 The rationale behind this change: - the library is compiled into a jar file, but its R class is generated making the constant not constant (static, not final static) (aapt option --non-constant-id). Also the jar file does not contain the R class. - this allows the integer value to not be inlined in the compiled class files. Note that this prevents using switch statements. - the main project use this jar file as a normal static library: it will add all the class files except the R.class. - the main project uses the library res folder as a resource folder with lower priority than the main project (basically the main project is an overlay. This is accomplished using aapt's --auto-add-overlay to handle resources only in the main project (which the normal overlay mechanism doesn't allow). - the main project creates R classes in the main project's package but also in the library's package. This is done with aapt's --extra-packages which accept as many packages as needed, separated by a :. - manifest merging is not done yet, so activities/services/permissions/etc... have to be manually declared in the main app. To use a static library with Android resource in your app, 1. Add the library's resource dir to your app as an overlay: LOCAL_RESOURCE_DIR := <app_resource_dir> <static_library_resource_dirs> 2. Set the proper aapt flags: LOCAL_AAPT_FLAGS := <apps_own_flags> --auto-add-overlay \ --extra-packages <lib1_package_name>:<lib2_package_name>:... Change-Id: Ifb4d2300b952ea4aaee74da1bb0c6c72ea0698a3
2011-12-14 23:29:28 +01:00
endif
More flexibility to keep/remove R.class in static Java library - Usually you don't need to set LOCAL_JAR_EXCLUDE_FILES in your Android.mk, if your static library is directly used by an app. - If your library will be included by another library that need reference the R/Manifest class, you can set LOCAL_JAR_EXCLUDE_FILES := none to keep the generated classes. - If your library includes another static library that has Android resource and you want to remove the generated classes carried by the static library, set: LOCAL_JAR_EXCLUDE_FILES := $(ANDROID_RESOURCE_GENERATED_CLASSES) With the LOCAL_JAR_EXCLUDE_FILES value "none", deprecate the old long variable LOCAL_KEEP_R_CLASS_IN_STATIC_JAVA_LIBRARY. Change-Id: I3b9ad5d66f0262f784feb09bc1537c5b01256258
2012-06-19 19:40:37 +02:00
ifeq (none,$(LOCAL_JAR_EXCLUDE_FILES))
LOCAL_JAR_EXCLUDE_FILES :=
Option to keep the generated R class in static Java libarry Bug: 6404748 Set LOCAL_KEEP_R_CLASS_IN_STATIC_JAVA_LIBRARY to true to do that. Change-Id: Ieee3cae431e3b1484ec598312729f2c871db2315
2012-04-26 21:26:33 +02:00
endif
Allow to run Proguard on static Java library 1. Let aapt output the proguard_options file 2. If proguard is enabled, switch the dependency from $(full_classes_jar) to $(full_classes_proguard_jar). Change-Id: Idc641a1515b8899a4623a2aeec5cd494f6c1c1c5
2013-03-26 20:42:32 +01:00
proguard_options_file :=
Updated static_java_library.mk to support proguard options. For reference we are trying to build an AAR and want to filter out anything private and anything marked @hide. Test: built dist and verified package contents. Change-Id: I2b9847501d677f56d3918ac0694e6e1f6cda32c8
2016-11-15 02:18:55 +01:00
ifneq ($(filter custom,$(LOCAL_PROGUARD_ENABLED)),custom)
Allow to run Proguard on static Java library 1. Let aapt output the proguard_options file 2. If proguard is enabled, switch the dependency from $(full_classes_jar) to $(full_classes_proguard_jar). Change-Id: Idc641a1515b8899a4623a2aeec5cd494f6c1c1c5
2013-03-26 20:42:32 +01:00
proguard_options_file := $(intermediates.COMMON)/proguard_options
endif
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
Allow to run Proguard on static Java library 1. Let aapt output the proguard_options file 2. If proguard is enabled, switch the dependency from $(full_classes_jar) to $(full_classes_proguard_jar). Change-Id: Idc641a1515b8899a4623a2aeec5cd494f6c1c1c5
2013-03-26 20:42:32 +01:00
LOCAL_PROGUARD_FLAGS := $(addprefix -include ,$(proguard_options_file)) $(LOCAL_PROGUARD_FLAGS)
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_options_file)
Allow to run Proguard on static Java library 1. Let aapt output the proguard_options file 2. If proguard is enabled, switch the dependency from $(full_classes_jar) to $(full_classes_proguard_jar). Change-Id: Idc641a1515b8899a4623a2aeec5cd494f6c1c1c5
2013-03-26 20:42:32 +01:00
Support to build with AAPT2 To build with AAPT2, set "USE_AAPT2=true". TODO: Support split apks and generated resources from other than renderscript. Bug: 25958912 Change-Id: I19b1a038824ce5b2a3d3ffadbce3173c845193fc
2015-12-04 22:59:18 +01:00
R_file_stamp := $(intermediates.COMMON)/src/R.stamp
LOCAL_INTERMEDIATE_TARGETS += $(R_file_stamp)
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
ifneq ($(strip $(LOCAL_STATIC_ANDROID_LIBRARIES) $(LOCAL_STATIC_JAVA_AAR_LIBRARIES)),)
# If we are using static android libraries, every source file becomes an overlay.
# This is to emulate old AAPT behavior which simulated library support.
my_res_resources :=
my_overlay_resources := $(all_resources)
else
# Otherwise, for a library we treat all the resource equal with no overlay.
my_res_resources := $(all_resources)
my_overlay_resources :=
endif
# For libraries put everything in the COMMON intermediate directory.
my_res_package := $(intermediates.COMMON)/package-res.apk
LOCAL_INTERMEDIATE_TARGETS += $(my_res_package)
Fix resource overlay order for static libraries If a static library has static library dependencies then all resources need to be moved to an overlay to maintain the correct ordering so that a static library resource overlays the same resource in a dependency. Bug: 124108931 Test: m checkbuild Change-Id: I6be9a80c53e6247a6589272ab0e653a9a0ded814
2019-02-13 22:14:07 +01:00
Fix comment indicator on endif It's referring to the wrong if start. Change-Id: I6f78aee54fb89fb5f69a4e86102d5a8e2cc2bbd1
2018-01-25 23:55:31 +01:00
endif # need_compile_res
Support to build static Java library with Android resource Bug: 5714516 The rationale behind this change: - the library is compiled into a jar file, but its R class is generated making the constant not constant (static, not final static) (aapt option --non-constant-id). Also the jar file does not contain the R class. - this allows the integer value to not be inlined in the compiled class files. Note that this prevents using switch statements. - the main project use this jar file as a normal static library: it will add all the class files except the R.class. - the main project uses the library res folder as a resource folder with lower priority than the main project (basically the main project is an overlay. This is accomplished using aapt's --auto-add-overlay to handle resources only in the main project (which the normal overlay mechanism doesn't allow). - the main project creates R classes in the main project's package but also in the library's package. This is done with aapt's --extra-packages which accept as many packages as needed, separated by a :. - manifest merging is not done yet, so activities/services/permissions/etc... have to be manually declared in the main app. To use a static library with Android resource in your app, 1. Add the library's resource dir to your app as an overlay: LOCAL_RESOURCE_DIR := <app_resource_dir> <static_library_resource_dirs> 2. Set the proper aapt flags: LOCAL_AAPT_FLAGS := <apps_own_flags> --auto-add-overlay \ --extra-packages <lib1_package_name>:<lib2_package_name>:... Change-Id: Ifb4d2300b952ea4aaee74da1bb0c6c72ea0698a3
2011-12-14 23:29:28 +01:00
Make it a fatal error if no source files for Java module. Change-Id: Ia04158c11381b6b1687b9d5c699a9ea8ae3cb317
2013-08-28 20:16:06 +02:00
all_res_assets := $(all_resources)
Move aapt2.mk before java.mk aapt2.mk will export a srcjar that will be compiled by java.mk, so it needs to be evaluated first. Also move java_renderscript.mk before aapt2.mk so that the generated resoures are available. Bug: 73885582 Test: m checkbuild Test: rm -rf out/target/common/obj/APPS/RsHelloCompute_intermediates && m out/target/common/obj/APPS/RsHelloCompute_intermediates/src/R.stamp Change-Id: Ide3050ec993a945f7077b75e952c3b3532306ede Merged-In: Ide3050ec993a945f7077b75e952c3b3532306ede (cherry picked from commit 8528eabbba28fc5e554165cb75785682dbd68679)
2018-03-07 01:21:36 +01:00
include $(BUILD_SYSTEM)/java_renderscript.mk
Support to build static Java library with Android resource Bug: 5714516 The rationale behind this change: - the library is compiled into a jar file, but its R class is generated making the constant not constant (static, not final static) (aapt option --non-constant-id). Also the jar file does not contain the R class. - this allows the integer value to not be inlined in the compiled class files. Note that this prevents using switch statements. - the main project use this jar file as a normal static library: it will add all the class files except the R.class. - the main project uses the library res folder as a resource folder with lower priority than the main project (basically the main project is an overlay. This is accomplished using aapt's --auto-add-overlay to handle resources only in the main project (which the normal overlay mechanism doesn't allow). - the main project creates R classes in the main project's package but also in the library's package. This is done with aapt's --extra-packages which accept as many packages as needed, separated by a :. - manifest merging is not done yet, so activities/services/permissions/etc... have to be manually declared in the main app. To use a static library with Android resource in your app, 1. Add the library's resource dir to your app as an overlay: LOCAL_RESOURCE_DIR := <app_resource_dir> <static_library_resource_dirs> 2. Set the proper aapt flags: LOCAL_AAPT_FLAGS := <apps_own_flags> --auto-add-overlay \ --extra-packages <lib1_package_name>:<lib2_package_name>:... Change-Id: Ifb4d2300b952ea4aaee74da1bb0c6c72ea0698a3
2011-12-14 23:29:28 +01:00
Allow LOCAL_RESOURCE_DIR pointing to dir generated during the build Bug: 15850610 Change-Id: I46b98adb556d8e6bf166761f8bb240006dbe5b14
2014-06-25 22:23:58 +02:00
ifeq (true,$(need_compile_res))
Move manifest generation logic into static_java_library.mk Previously a manifest file would be generated for static_java_library.mk and package_internal.mk. For pacakge_internal.mk, this would cause cryptic errors like b/188612215#2 With this CL, a manifest file would only be generated for java_library with need_compile_res == true. The advantages are 1. No redundant generation for java_library with need_compile_res == false (i.e. modules that do not require aapt2) 2. Force devs to provide manifest for android_app, and not silently generating one for them Bug: 188652897 Test: TH Test: m nothing in tv-dev, car-dev Change-Id: I69a23e373f1b4ac1569ae5b1d36067bfc0dadc05
2021-11-02 04:54:05 +01:00
# work around missing manifests by creating a default one
ifeq (,$(strip $(LOCAL_MANIFEST_FILE)$(LOCAL_FULL_MANIFEST_FILE)))
ifeq (,$(wildcard $(LOCAL_PATH)/AndroidManifest.xml))
LOCAL_FULL_MANIFEST_FILE := $(call local-intermediates-dir,COMMON)/DefaultManifest.xml
$(call create-default-manifest-file,$(LOCAL_FULL_MANIFEST_FILE),$(call module-min-sdk-version))
endif
endif
Set up rules to merge AndroidManifest.xmls Now you can merge the library manifest files to the main app's AndroidManifest.xml with LOCAL_FULL_LIBS_MANIFEST_FILES. LOCAL_FULL_LIBS_MANIFEST_FILES is a list of paths relative to the top of the source tree. Bug: 12907528 Change-Id: I16a347c83dfb6fbbb7d5d40284b7c65aa682fdd2
2014-02-06 03:24:45 +01:00
include $(BUILD_SYSTEM)/android_manifest.mk
Support to build static Java library with Android resource Bug: 5714516 The rationale behind this change: - the library is compiled into a jar file, but its R class is generated making the constant not constant (static, not final static) (aapt option --non-constant-id). Also the jar file does not contain the R class. - this allows the integer value to not be inlined in the compiled class files. Note that this prevents using switch statements. - the main project use this jar file as a normal static library: it will add all the class files except the R.class. - the main project uses the library res folder as a resource folder with lower priority than the main project (basically the main project is an overlay. This is accomplished using aapt's --auto-add-overlay to handle resources only in the main project (which the normal overlay mechanism doesn't allow). - the main project creates R classes in the main project's package but also in the library's package. This is done with aapt's --extra-packages which accept as many packages as needed, separated by a :. - manifest merging is not done yet, so activities/services/permissions/etc... have to be manually declared in the main app. To use a static library with Android resource in your app, 1. Add the library's resource dir to your app as an overlay: LOCAL_RESOURCE_DIR := <app_resource_dir> <static_library_resource_dirs> 2. Set the proper aapt flags: LOCAL_AAPT_FLAGS := <apps_own_flags> --auto-add-overlay \ --extra-packages <lib1_package_name>:<lib2_package_name>:... Change-Id: Ifb4d2300b952ea4aaee74da1bb0c6c72ea0698a3
2011-12-14 23:29:28 +01:00
Default LOCAL_SDK_RES_VERSION to LOCAL_SDK_VERSION in static_java_library.mk. Change-Id: I25ad47fea0fdb10c8aa0a0cb0d4c5ed117cd76ef
2012-01-03 20:52:26 +01:00
LOCAL_SDK_RES_VERSION:=$(strip $(LOCAL_SDK_RES_VERSION))
ifeq ($(LOCAL_SDK_RES_VERSION),)
LOCAL_SDK_RES_VERSION:=$(LOCAL_SDK_VERSION)
endif
Support to build static Java library with Android resource Bug: 5714516 The rationale behind this change: - the library is compiled into a jar file, but its R class is generated making the constant not constant (static, not final static) (aapt option --non-constant-id). Also the jar file does not contain the R class. - this allows the integer value to not be inlined in the compiled class files. Note that this prevents using switch statements. - the main project use this jar file as a normal static library: it will add all the class files except the R.class. - the main project uses the library res folder as a resource folder with lower priority than the main project (basically the main project is an overlay. This is accomplished using aapt's --auto-add-overlay to handle resources only in the main project (which the normal overlay mechanism doesn't allow). - the main project creates R classes in the main project's package but also in the library's package. This is done with aapt's --extra-packages which accept as many packages as needed, separated by a :. - manifest merging is not done yet, so activities/services/permissions/etc... have to be manually declared in the main app. To use a static library with Android resource in your app, 1. Add the library's resource dir to your app as an overlay: LOCAL_RESOURCE_DIR := <app_resource_dir> <static_library_resource_dirs> 2. Set the proper aapt flags: LOCAL_AAPT_FLAGS := <apps_own_flags> --auto-add-overlay \ --extra-packages <lib1_package_name>:<lib2_package_name>:... Change-Id: Ifb4d2300b952ea4aaee74da1bb0c6c72ea0698a3
2011-12-14 23:29:28 +01:00
framework_res_package_export :=
# Please refer to package.mk
ifneq ($(LOCAL_NO_STANDARD_LIBRARIES),true)
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-out current system_current test_current,$(LOCAL_SDK_RES_VERSION))$(if $(TARGET_BUILD_USE_PREBUILT_SDKS),$(filter current system_current test_current,$(LOCAL_SDK_RES_VERSION))),)
Support to build static Java library with Android resource Bug: 5714516 The rationale behind this change: - the library is compiled into a jar file, but its R class is generated making the constant not constant (static, not final static) (aapt option --non-constant-id). Also the jar file does not contain the R class. - this allows the integer value to not be inlined in the compiled class files. Note that this prevents using switch statements. - the main project use this jar file as a normal static library: it will add all the class files except the R.class. - the main project uses the library res folder as a resource folder with lower priority than the main project (basically the main project is an overlay. This is accomplished using aapt's --auto-add-overlay to handle resources only in the main project (which the normal overlay mechanism doesn't allow). - the main project creates R classes in the main project's package but also in the library's package. This is done with aapt's --extra-packages which accept as many packages as needed, separated by a :. - manifest merging is not done yet, so activities/services/permissions/etc... have to be manually declared in the main app. To use a static library with Android resource in your app, 1. Add the library's resource dir to your app as an overlay: LOCAL_RESOURCE_DIR := <app_resource_dir> <static_library_resource_dirs> 2. Set the proper aapt flags: LOCAL_AAPT_FLAGS := <apps_own_flags> --auto-add-overlay \ --extra-packages <lib1_package_name>:<lib2_package_name>:... Change-Id: Ifb4d2300b952ea4aaee74da1bb0c6c72ea0698a3
2011-12-14 23:29:28 +01:00
framework_res_package_export := \
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
$(call resolve-prebuilt-sdk-jar-path,$(LOCAL_SDK_RES_VERSION))
Support to build static Java library with Android resource Bug: 5714516 The rationale behind this change: - the library is compiled into a jar file, but its R class is generated making the constant not constant (static, not final static) (aapt option --non-constant-id). Also the jar file does not contain the R class. - this allows the integer value to not be inlined in the compiled class files. Note that this prevents using switch statements. - the main project use this jar file as a normal static library: it will add all the class files except the R.class. - the main project uses the library res folder as a resource folder with lower priority than the main project (basically the main project is an overlay. This is accomplished using aapt's --auto-add-overlay to handle resources only in the main project (which the normal overlay mechanism doesn't allow). - the main project creates R classes in the main project's package but also in the library's package. This is done with aapt's --extra-packages which accept as many packages as needed, separated by a :. - manifest merging is not done yet, so activities/services/permissions/etc... have to be manually declared in the main app. To use a static library with Android resource in your app, 1. Add the library's resource dir to your app as an overlay: LOCAL_RESOURCE_DIR := <app_resource_dir> <static_library_resource_dirs> 2. Set the proper aapt flags: LOCAL_AAPT_FLAGS := <apps_own_flags> --auto-add-overlay \ --extra-packages <lib1_package_name>:<lib2_package_name>:... Change-Id: Ifb4d2300b952ea4aaee74da1bb0c6c72ea0698a3
2011-12-14 23:29:28 +01:00
else
framework_res_package_export := \
$(call intermediates-dir-for,APPS,framework-res,,COMMON)/package-export.apk
endif
endif
Support LOCAL_STATIC_JAVA_AAR_LIBRARIES with aapt2 LOCAL_STATIC_JAVA_AAR_LIBRARIES are slightly different from LOCAL_STATIC_ANDROID_LIBRARIES, due to b/78447299 the AndroidManifest.xml from ANDROID libraries are ignored. Temporarily add support for LOCAL_STATIC_JAVA_AAR_LIBRARIES when using LOCAL_USE_AAPT2 := true, treating them the same as LOCAL_STATIC_ANDROID_LIBRARIES except that they are merged by android_manifest.xml Bug: 78447299 Bug: 79481102 Test: m FORCE_AAPT2=true checkbuild Change-Id: Ia6210810c1ea6e776be97ae1c9a586b5de844125
2018-05-23 22:35:53 +02:00
import_proguard_flag_files := $(strip $(foreach l,$(LOCAL_STATIC_ANDROID_LIBRARIES) $(LOCAL_STATIC_JAVA_AAR_LIBRARIES),\
Revert "Revert "Propagate proguard rules from LOCAL_STATIC_ANDROID_LIBRARIES"" This reverts commit 30d6869faf6f288002d3d2181bc50e79ddc04fb2. Fixes an issue with the original change where proguard files without newlines at the end of the file would get merged with the next file. Most of the time the next file started with a comment, which worked fine, but sometimes it was a syntax error. Bug: 72969557 Test: m Test: build on an internal tree that failed last time Change-Id: I66f13ae80ee0f96b456e526bfbfc2cdcf82c3f3a
2018-02-10 00:19:11 +01:00
$(call intermediates-dir-for,JAVA_LIBRARIES,$(l),,COMMON)/export_proguard_flags))
$(intermediates.COMMON)/export_proguard_flags: $(import_proguard_flag_files) $(addprefix $(LOCAL_PATH)/,$(LOCAL_EXPORT_PROGUARD_FLAG_FILES))
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 Merged-In: Id7a92fb2c44913bccbfcbeae127355b4de588e4d (cherry picked from commit 1417c177ac9b942c4f1ae602f420444c72a90d6a)
2017-11-17 22:11:26 +01:00
@echo "Export proguard flags: $@"
rm -f $@
Revert "Revert "Propagate proguard rules from LOCAL_STATIC_ANDROID_LIBRARIES"" This reverts commit 30d6869faf6f288002d3d2181bc50e79ddc04fb2. Fixes an issue with the original change where proguard files without newlines at the end of the file would get merged with the next file. Most of the time the next file started with a comment, which worked fine, but sometimes it was a syntax error. Bug: 72969557 Test: m Test: build on an internal tree that failed last time Change-Id: I66f13ae80ee0f96b456e526bfbfc2cdcf82c3f3a
2018-02-10 00:19:11 +01:00
touch $@
for f in $+; do \
echo -e "\n# including $$f" >>$@; \
cat $$f >>$@; \
done
import_proguard_flag_files :=
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 Merged-In: Id7a92fb2c44913bccbfcbeae127355b4de588e4d (cherry picked from commit 1417c177ac9b942c4f1ae602f420444c72a90d6a)
2017-11-17 22:11:26 +01:00
Move aapt flags from java_common.mk to aapt_flags.mk The aapt flags were being set in java_common.mk, which is used by various entry points. host_dalvik_java_library.mk and host_java_library.mk, and java_library.mk don't support aapt, only package_internal.mk and static_java_library.mk do. Move the aapt flags into aapt_flags.mk, and include it from package_internal.mk and static_java_library.mk. Bug: 73885582 Test: no change to build-${TARGET_PRODUCT}.ninja Change-Id: I124393846d37b9bbc941272cce4274121ac235ef
2018-03-07 03:18:06 +01:00
include $(BUILD_SYSTEM)/aapt_flags.mk
Move aapt2.mk before java.mk aapt2.mk will export a srcjar that will be compiled by java.mk, so it needs to be evaluated first. Also move java_renderscript.mk before aapt2.mk so that the generated resoures are available. Bug: 73885582 Test: m checkbuild Test: rm -rf out/target/common/obj/APPS/RsHelloCompute_intermediates && m out/target/common/obj/APPS/RsHelloCompute_intermediates/src/R.stamp Change-Id: Ide3050ec993a945f7077b75e952c3b3532306ede Merged-In: Ide3050ec993a945f7077b75e952c3b3532306ede (cherry picked from commit 8528eabbba28fc5e554165cb75785682dbd68679)
2018-03-07 01:21:36 +01:00
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_AAPT_FLAGS := $(LOCAL_AAPT_FLAGS)
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_TARGET_AAPT_CHARACTERISTICS := $(TARGET_AAPT_CHARACTERISTICS)
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_MANIFEST_PACKAGE_NAME := $(LOCAL_MANIFEST_PACKAGE_NAME)
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_MANIFEST_INSTRUMENTATION_FOR := $(LOCAL_MANIFEST_INSTRUMENTATION_FOR)
Support to build static Java library with Android resource Bug: 5714516 The rationale behind this change: - the library is compiled into a jar file, but its R class is generated making the constant not constant (static, not final static) (aapt option --non-constant-id). Also the jar file does not contain the R class. - this allows the integer value to not be inlined in the compiled class files. Note that this prevents using switch statements. - the main project use this jar file as a normal static library: it will add all the class files except the R.class. - the main project uses the library res folder as a resource folder with lower priority than the main project (basically the main project is an overlay. This is accomplished using aapt's --auto-add-overlay to handle resources only in the main project (which the normal overlay mechanism doesn't allow). - the main project creates R classes in the main project's package but also in the library's package. This is done with aapt's --extra-packages which accept as many packages as needed, separated by a :. - manifest merging is not done yet, so activities/services/permissions/etc... have to be manually declared in the main app. To use a static library with Android resource in your app, 1. Add the library's resource dir to your app as an overlay: LOCAL_RESOURCE_DIR := <app_resource_dir> <static_library_resource_dirs> 2. Set the proper aapt flags: LOCAL_AAPT_FLAGS := <apps_own_flags> --auto-add-overlay \ --extra-packages <lib1_package_name>:<lib2_package_name>:... Change-Id: Ifb4d2300b952ea4aaee74da1bb0c6c72ea0698a3
2011-12-14 23:29:28 +01:00
# add --non-constant-id to prevent inlining constants.
Support to build AAR for static Java libraries. Set up rules to build $(built_aar), if a static Java library has Android resources. If you run "tapas my_lib && make dist", my_lib.aar will be built and put in the DIST_DIR. Bug: 18759503 Change-Id: I36b912eb7bbab241fe48319115ea320efe77c705
2014-12-18 02:00:53 +01:00
# AAR needs text symbol file R.txt.
Move R.txt and make aapt2 generate it Move R.txt from $(intermediates.COMMON)/src to $(intermediates.COMMON) in preparation for moving aapt/aapt2 java files out of src. Also make aapt2 generate R.txt, and make it an implicit output of the rule and and input to the aar rule. Bug: 73885582 Test: m out/target/common/obj/JAVA_LIBRARIES/SettingsLib_intermediates/javalib.aar Test: m checkbuild Change-Id: Ia858de226355965b69794c002f841333df16a612 Merged-In: Ia858de226355965b69794c002f841333df16a612 (cherry picked from commit 7c24f8ec85266cc93c873b2daffc3952a70b2d5f)
2018-03-12 22:56:27 +01:00
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_AAPT_FLAGS := $(LOCAL_AAPT_FLAGS) --static-lib --output-text-symbols $(intermediates.COMMON)/R.txt
Enable apps to build with resource namespaces Setting LOCAL_AAPT_NAMESPACES := true enables namespaces for an app and requires any library resources to be fully qualified by their package. Test: manual Bug: 73885582 Change-Id: Ia6bfc82ee8b8d6335f8e7c2abe94ce36467a012d Merged-In: Ia6bfc82ee8b8d6335f8e7c2abe94ce36467a012d
2017-08-17 00:52:53 +02:00
ifndef LOCAL_AAPT_NAMESPACES
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_AAPT_FLAGS += --no-static-lib-packages
endif
AAPT2: Enable product/config filtering and improve source ordering - Restore old ordering of resource files to match AAPT behavior - Change the order in which overlays are processed. Change-Id: I9da88f6b4124e7f89a70eb485b4591d5c4c87d38
2016-02-26 20:13:43 +01:00
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_PRODUCT_AAPT_CONFIG :=
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_PRODUCT_AAPT_PREF_CONFIG :=
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_TARGET_AAPT_CHARACTERISTICS :=
Support to build with AAPT2 To build with AAPT2, set "USE_AAPT2=true". TODO: Support split apks and generated resources from other than renderscript. Bug: 25958912 Change-Id: I19b1a038824ce5b2a3d3ffadbce3173c845193fc
2015-12-04 22:59:18 +01:00
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_ANDROID_MANIFEST := $(full_android_manifest)
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_RESOURCE_PUBLICS_OUTPUT := $(intermediates.COMMON)/public_resources.xml
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_RESOURCE_DIR := $(LOCAL_RESOURCE_DIR)
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_AAPT_INCLUDES := $(framework_res_package_export)
AAPT2: Enable product/config filtering and improve source ordering - Restore old ordering of resource files to match AAPT behavior - Change the order in which overlays are processed. Change-Id: I9da88f6b4124e7f89a70eb485b4591d5c4c87d38
2016-02-26 20:13:43 +01:00
Support to build with AAPT2 To build with AAPT2, set "USE_AAPT2=true". TODO: Support split apks and generated resources from other than renderscript. Bug: 25958912 Change-Id: I19b1a038824ce5b2a3d3ffadbce3173c845193fc
2015-12-04 22:59:18 +01:00
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_ASSET_DIR :=
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_PROGUARD_OPTIONS_FILE := $(proguard_options_file)
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_MANIFEST_PACKAGE_NAME :=
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_MANIFEST_INSTRUMENTATION_FOR :=
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
# One more level with name res so we can zip up the flat resources that can be linked by apps.
my_compiled_res_base_dir := $(intermediates.COMMON)/flat-res/res
ifneq (,$(filter-out current,$(renderscript_target_api)))
ifneq ($(call math_gt_or_eq,$(renderscript_target_api),21),true)
my_generated_res_zips := $(rs_generated_res_zip)
endif # renderscript_target_api < 21
endif # renderscript_target_api is set
include $(BUILD_SYSTEM)/aapt2.mk
$(my_res_package) : $(framework_res_package_export)
$(my_res_package): .KATI_IMPLICIT_OUTPUTS += $(intermediates.COMMON)/R.txt
Support to build static Java library with Android resource Bug: 5714516 The rationale behind this change: - the library is compiled into a jar file, but its R class is generated making the constant not constant (static, not final static) (aapt option --non-constant-id). Also the jar file does not contain the R class. - this allows the integer value to not be inlined in the compiled class files. Note that this prevents using switch statements. - the main project use this jar file as a normal static library: it will add all the class files except the R.class. - the main project uses the library res folder as a resource folder with lower priority than the main project (basically the main project is an overlay. This is accomplished using aapt's --auto-add-overlay to handle resources only in the main project (which the normal overlay mechanism doesn't allow). - the main project creates R classes in the main project's package but also in the library's package. This is done with aapt's --extra-packages which accept as many packages as needed, separated by a :. - manifest merging is not done yet, so activities/services/permissions/etc... have to be manually declared in the main app. To use a static library with Android resource in your app, 1. Add the library's resource dir to your app as an overlay: LOCAL_RESOURCE_DIR := <app_resource_dir> <static_library_resource_dirs> 2. Set the proper aapt flags: LOCAL_AAPT_FLAGS := <apps_own_flags> --auto-add-overlay \ --extra-packages <lib1_package_name>:<lib2_package_name>:... Change-Id: Ifb4d2300b952ea4aaee74da1bb0c6c72ea0698a3
2011-12-14 23:29:28 +01:00
Move aapt2.mk before java.mk aapt2.mk will export a srcjar that will be compiled by java.mk, so it needs to be evaluated first. Also move java_renderscript.mk before aapt2.mk so that the generated resoures are available. Bug: 73885582 Test: m checkbuild Test: rm -rf out/target/common/obj/APPS/RsHelloCompute_intermediates && m out/target/common/obj/APPS/RsHelloCompute_intermediates/src/R.stamp Change-Id: Ide3050ec993a945f7077b75e952c3b3532306ede Merged-In: Ide3050ec993a945f7077b75e952c3b3532306ede (cherry picked from commit 8528eabbba28fc5e554165cb75785682dbd68679)
2018-03-07 01:21:36 +01:00
endif # need_compile_res
include $(BUILD_SYSTEM)/java_library.mk
ifeq (true,$(need_compile_res))
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
$(LOCAL_BUILT_MODULE): $(R_file_stamp)
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): $(R_file_stamp)
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
$(full_classes_compiled_jar): $(R_file_stamp)
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): $(R_file_stamp)
Support to build static Java library with Android resource Bug: 5714516 The rationale behind this change: - the library is compiled into a jar file, but its R class is generated making the constant not constant (static, not final static) (aapt option --non-constant-id). Also the jar file does not contain the R class. - this allows the integer value to not be inlined in the compiled class files. Note that this prevents using switch statements. - the main project use this jar file as a normal static library: it will add all the class files except the R.class. - the main project uses the library res folder as a resource folder with lower priority than the main project (basically the main project is an overlay. This is accomplished using aapt's --auto-add-overlay to handle resources only in the main project (which the normal overlay mechanism doesn't allow). - the main project creates R classes in the main project's package but also in the library's package. This is done with aapt's --extra-packages which accept as many packages as needed, separated by a :. - manifest merging is not done yet, so activities/services/permissions/etc... have to be manually declared in the main app. To use a static library with Android resource in your app, 1. Add the library's resource dir to your app as an overlay: LOCAL_RESOURCE_DIR := <app_resource_dir> <static_library_resource_dirs> 2. Set the proper aapt flags: LOCAL_AAPT_FLAGS := <apps_own_flags> --auto-add-overlay \ --extra-packages <lib1_package_name>:<lib2_package_name>:... Change-Id: Ifb4d2300b952ea4aaee74da1bb0c6c72ea0698a3
2011-12-14 23:29:28 +01:00
Updated static_java_library.mk to support proguard options. For reference we are trying to build an AAR and want to filter out anything private and anything marked @hide. Test: built dist and verified package contents. Change-Id: I2b9847501d677f56d3918ac0694e6e1f6cda32c8
2016-11-15 02:18:55 +01:00
# if we have custom proguarding done use the proguarded classes jar instead of the normal classes jar
ifeq ($(filter custom,$(LOCAL_PROGUARD_ENABLED)),custom)
aar_classes_jar = $(full_classes_jar)
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
2017-03-29 21:58:15 +02:00
else
aar_classes_jar = $(full_classes_pre_proguard_jar)
Updated static_java_library.mk to support proguard options. For reference we are trying to build an AAR and want to filter out anything private and anything marked @hide. Test: built dist and verified package contents. Change-Id: I2b9847501d677f56d3918ac0694e6e1f6cda32c8
2016-11-15 02:18:55 +01:00
endif
Support to build AAR for static Java libraries. Set up rules to build $(built_aar), if a static Java library has Android resources. If you run "tapas my_lib && make dist", my_lib.aar will be built and put in the DIST_DIR. Bug: 18759503 Change-Id: I36b912eb7bbab241fe48319115ea320efe77c705
2014-12-18 02:00:53 +01:00
# Rule to build AAR, archive including classes.jar, resource, etc.
built_aar := $(intermediates.COMMON)/javalib.aar
$(built_aar): PRIVATE_MODULE := $(LOCAL_MODULE)
$(built_aar): PRIVATE_ANDROID_MANIFEST := $(full_android_manifest)
Updated static_java_library.mk to support proguard options. For reference we are trying to build an AAR and want to filter out anything private and anything marked @hide. Test: built dist and verified package contents. Change-Id: I2b9847501d677f56d3918ac0694e6e1f6cda32c8
2016-11-15 02:18:55 +01:00
$(built_aar): PRIVATE_CLASSES_JAR := $(aar_classes_jar)
Support to build AAR for static Java libraries. Set up rules to build $(built_aar), if a static Java library has Android resources. If you run "tapas my_lib && make dist", my_lib.aar will be built and put in the DIST_DIR. Bug: 18759503 Change-Id: I36b912eb7bbab241fe48319115ea320efe77c705
2014-12-18 02:00:53 +01:00
$(built_aar): PRIVATE_RESOURCE_DIR := $(LOCAL_RESOURCE_DIR)
Move R.txt and make aapt2 generate it Move R.txt from $(intermediates.COMMON)/src to $(intermediates.COMMON) in preparation for moving aapt/aapt2 java files out of src. Also make aapt2 generate R.txt, and make it an implicit output of the rule and and input to the aar rule. Bug: 73885582 Test: m out/target/common/obj/JAVA_LIBRARIES/SettingsLib_intermediates/javalib.aar Test: m checkbuild Change-Id: Ia858de226355965b69794c002f841333df16a612 Merged-In: Ia858de226355965b69794c002f841333df16a612 (cherry picked from commit 7c24f8ec85266cc93c873b2daffc3952a70b2d5f)
2018-03-12 22:56:27 +01:00
$(built_aar): PRIVATE_R_TXT := $(intermediates.COMMON)/R.txt
Sort files in directories passed to jar jar -C <dir> . produces a jar containing files in filesystem order, which can vary between builds. Manually find and sort the list of files, and convert them into a list of -C <dir> <file> pairs. Fixes: 64634025 Test: m -j checkbuild Test: m -j out/target/product/sailfish/system/framework/ext.jar, check that entries are sorted Test: m -j out/target/product/generic_arm64/system/framework/ext.jar on mac Change-Id: I7dced6acbe621a60cd49daf17872941485602732
2017-08-11 00:24:10 +02:00
$(built_aar): $(JAR_ARGS)
Move R.txt and make aapt2 generate it Move R.txt from $(intermediates.COMMON)/src to $(intermediates.COMMON) in preparation for moving aapt/aapt2 java files out of src. Also make aapt2 generate R.txt, and make it an implicit output of the rule and and input to the aar rule. Bug: 73885582 Test: m out/target/common/obj/JAVA_LIBRARIES/SettingsLib_intermediates/javalib.aar Test: m checkbuild Change-Id: Ia858de226355965b69794c002f841333df16a612 Merged-In: Ia858de226355965b69794c002f841333df16a612 (cherry picked from commit 7c24f8ec85266cc93c873b2daffc3952a70b2d5f)
2018-03-12 22:56:27 +01:00
$(built_aar) : $(aar_classes_jar) $(full_android_manifest) $(intermediates.COMMON)/R.txt
Support to build AAR for static Java libraries. Set up rules to build $(built_aar), if a static Java library has Android resources. If you run "tapas my_lib && make dist", my_lib.aar will be built and put in the DIST_DIR. Bug: 18759503 Change-Id: I36b912eb7bbab241fe48319115ea320efe77c705
2014-12-18 02:00:53 +01:00
@echo "target AAR: $(PRIVATE_MODULE) ($@)"
$(hide) rm -rf $(dir $@)aar && mkdir -p $(dir $@)aar/res
$(hide) cp $(PRIVATE_ANDROID_MANIFEST) $(dir $@)aar/AndroidManifest.xml
$(hide) cp $(PRIVATE_CLASSES_JAR) $(dir $@)aar/classes.jar
# Note: Use "cp -n" to honor the resource overlay rules, if multiple res dirs exist.
$(hide) $(foreach res,$(PRIVATE_RESOURCE_DIR),cp -Rfn $(res)/* $(dir $@)aar/res;)
$(hide) cp $(PRIVATE_R_TXT) $(dir $@)aar/R.txt
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) $(JAR) -cMf $@ \
Fix typo when building aar I7dced6acbe621a60cd49daf17872941485602732 introduced a typo, fix (dir $@) to $(dir $@). Bug: 64634025 Test: m -j on affected target Change-Id: Ic7181631630662970337c542b73cd0de6f3f995f
2017-08-17 08:33:17 +02:00
$(call jar-args-sorted-files-in-directory,$(dir $@)aar)
Support to build AAR for static Java libraries. Set up rules to build $(built_aar), if a static Java library has Android resources. If you run "tapas my_lib && make dist", my_lib.aar will be built and put in the DIST_DIR. Bug: 18759503 Change-Id: I36b912eb7bbab241fe48319115ea320efe77c705
2014-12-18 02:00:53 +01:00
# Register the aar file.
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).AAR := $(built_aar)
Allow LOCAL_RESOURCE_DIR pointing to dir generated during the build Bug: 15850610 Change-Id: I46b98adb556d8e6bf166761f8bb240006dbe5b14
2014-06-25 22:23:58 +02:00
endif # need_compile_res
Support to build static Java library with Android resource Bug: 5714516 The rationale behind this change: - the library is compiled into a jar file, but its R class is generated making the constant not constant (static, not final static) (aapt option --non-constant-id). Also the jar file does not contain the R class. - this allows the integer value to not be inlined in the compiled class files. Note that this prevents using switch statements. - the main project use this jar file as a normal static library: it will add all the class files except the R.class. - the main project uses the library res folder as a resource folder with lower priority than the main project (basically the main project is an overlay. This is accomplished using aapt's --auto-add-overlay to handle resources only in the main project (which the normal overlay mechanism doesn't allow). - the main project creates R classes in the main project's package but also in the library's package. This is done with aapt's --extra-packages which accept as many packages as needed, separated by a :. - manifest merging is not done yet, so activities/services/permissions/etc... have to be manually declared in the main app. To use a static library with Android resource in your app, 1. Add the library's resource dir to your app as an overlay: LOCAL_RESOURCE_DIR := <app_resource_dir> <static_library_resource_dirs> 2. Set the proper aapt flags: LOCAL_AAPT_FLAGS := <apps_own_flags> --auto-add-overlay \ --extra-packages <lib1_package_name>:<lib2_package_name>:... Change-Id: Ifb4d2300b952ea4aaee74da1bb0c6c72ea0698a3
2011-12-14 23:29:28 +01:00
Better handle of need_compile_java. Change-Id: I609a27e2b35b08962243b6516c6c525c0c938d3c
2013-08-28 22:04:46 +02:00
# Reset internal variables.
Updated static_java_library.mk to support proguard options. For reference we are trying to build an AAR and want to filter out anything private and anything marked @hide. Test: built dist and verified package contents. Change-Id: I2b9847501d677f56d3918ac0694e6e1f6cda32c8
2016-11-15 02:18:55 +01:00
aar_classes_jar :=
Better handle of need_compile_java. Change-Id: I609a27e2b35b08962243b6516c6c525c0c938d3c
2013-08-28 22:04:46 +02:00
all_res_assets :=
auto import from //depot/cupcake/@135843
2009-03-04 04:28:42 +01:00
LOCAL_IS_STATIC_JAVA_LIBRARY :=
Reference in a new issue Copy permalink