diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2018-08-20 03:08:54 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2018-08-20 03:15:10 +0000 |
| commit | faee5419b10d8c966f630640e53d204d47a3433c (patch) | |
| tree | 5330659397018c192ba70062f1360cfee51b724f | |
| parent | 5838ce3474814c0a1903bf0cf68454b8242150ab (diff) | |
| parent | a113745d1f15a358f427e9997490099e34807377 (diff) | |
| download | platform_build-faee5419b10d8c966f630640e53d204d47a3433c.tar.gz platform_build-faee5419b10d8c966f630640e53d204d47a3433c.tar.bz2 platform_build-faee5419b10d8c966f630640e53d204d47a3433c.zip | |
Make change and version bump to PQ1A.180820.001
Change-Id: I25d237f221b5980de4806202f60f1574bdaa9109
| -rw-r--r-- | core/binary.mk | 8 | ||||
| -rw-r--r-- | core/build_id.mk | 2 | ||||
| -rw-r--r-- | core/java_common.mk | 15 |
3 files changed, 19 insertions, 6 deletions
diff --git a/core/binary.mk b/core/binary.mk index 954df1f445..61cd5cf73f 100644 --- a/core/binary.mk +++ b/core/binary.mk @@ -1587,6 +1587,9 @@ installed_static_library_notice_file_targets := \ $(foreach lib,$(my_static_libraries) $(my_whole_static_libraries), \ NOTICE-$(if $(LOCAL_IS_HOST_MODULE),HOST,TARGET)-STATIC_LIBRARIES-$(lib)) +$(notice_target): | $(installed_static_library_notice_file_targets) +$(LOCAL_INSTALLED_MODULE): | $(notice_target) + # Default is -fno-rtti. ifeq ($(strip $(LOCAL_RTTI_FLAG)),) LOCAL_RTTI_FLAG := -fno-rtti @@ -1783,11 +1786,6 @@ all_libraries := \ $(built_static_libraries) \ $(built_whole_libraries) -# Also depend on the notice files for any static libraries that -# are linked into this module. This will force them to be installed -# when this module is. -$(LOCAL_INSTALLED_MODULE): | $(installed_static_library_notice_file_targets) - ########################################################### # Export includes ########################################################### diff --git a/core/build_id.mk b/core/build_id.mk index bffe2bc242..31397158c3 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=PQ1A.180817.001 +export BUILD_ID=PQ1A.180820.001 diff --git a/core/java_common.mk b/core/java_common.mk index 2b85dc145b..8f4611eed5 100644 --- a/core/java_common.mk +++ b/core/java_common.mk @@ -422,6 +422,21 @@ $(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_SHARED_JAVA_HEADER_LIBRARIES := $(full_sh ALL_MODULES.$(my_register_name).INTERMEDIATE_SOURCE_DIR := \ $(ALL_MODULES.$(my_register_name).INTERMEDIATE_SOURCE_DIR) $(LOCAL_INTERMEDIATE_SOURCE_DIR) + +########################################################## +# Copy NOTICE files of transitive static dependencies +# Don't do this in mm, since many of the targets won't exist. +ifeq ($(ONE_SHOT_MAKEFILE),) +installed_static_library_notice_file_targets := \ + $(foreach lib,$(LOCAL_STATIC_JAVA_LIBRARIES), \ + NOTICE-$(if $(LOCAL_IS_HOST_MODULE),HOST,TARGET)-JAVA_LIBRARIES-$(lib)) +else +installed_static_library_notice_file_targets := +endif + +$(notice_target): | $(installed_static_library_notice_file_targets) +$(LOCAL_INSTALLED_MODULE): | $(notice_target) + ########################################################### # Verify that all libraries are safe to use ########################################################### |