diff options
| -rw-r--r-- | Changes.md | 17 | ||||
| -rw-r--r-- | Deprecation.md | 14 | ||||
| -rw-r--r-- | core/Makefile | 16 | ||||
| -rw-r--r-- | core/base_rules.mk | 11 | ||||
| -rw-r--r-- | core/board_config.mk | 6 | ||||
| -rw-r--r-- | core/clear_vars.mk | 1 | ||||
| -rw-r--r-- | core/config.mk | 6 | ||||
| -rw-r--r-- | core/definitions.mk | 364 | ||||
| -rw-r--r-- | core/deprecation.mk | 12 | ||||
| -rw-r--r-- | core/main.mk | 2 | ||||
| -rw-r--r-- | core/notice_files.mk | 3 | ||||
| -rw-r--r-- | core/package_internal.mk | 2 | ||||
| -rw-r--r-- | core/soong_cc_prebuilt.mk | 8 | ||||
| -rw-r--r-- | core/soong_config.mk | 2 | ||||
| -rw-r--r-- | core/tasks/sdk-addon.mk | 8 | ||||
| -rw-r--r-- | core/tasks/tools/compatibility.mk | 4 | ||||
| -rw-r--r-- | target/product/gsi/Android.mk | 8 |
17 files changed, 237 insertions, 247 deletions
diff --git a/Changes.md b/Changes.md index be2a271e70..2cea334129 100644 --- a/Changes.md +++ b/Changes.md @@ -49,9 +49,9 @@ files to be split out into a separate static library that chooses `arm` over Modules that build for Windows (our only `HOST_CROSS` OS currently) must now be defined in `Android.bp` files. -## `LOCAL_MODULE_TAGS := eng debug` deprecation {#LOCAL_MODULE_TAGS} +## `LOCAL_MODULE_TAGS := eng debug` are obsolete {#LOCAL_MODULE_TAGS} -`LOCAL_MODULE_TAGS` value `eng` and `debug` are being deprecated. They allowed +`LOCAL_MODULE_TAGS` value `eng` and `debug` are now obsolete. They allowed modules to specify that they should always be installed on `-eng`, or `-eng` and `-userdebug` builds. This conflicted with the ability for products to specify which modules should be installed, effectively making it impossible to @@ -194,11 +194,9 @@ you're not trying to actively debug the kernel. ## `export` and `unexport` deprecation {#export_keyword} -The `export` and `unexport` keywords have been deprecated, and will throw -warnings or errors depending on where they are used. +The `export` and `unexport` keywords are obsolete, and will throw errors when +used. -Early in the make system, during product configuration and BoardConfig.mk -reading: these will throw a warnings, and will be an error in the future. Device specific configuration should not be able to affect common core build steps -- we're looking at triggering build steps to be invalidated if the set of environment variables they can access changes. If device specific @@ -206,10 +204,9 @@ configuration is allowed to change those, switching devices with the same output directory could become significantly more expensive than it already can be. -Later, during Android.mk files, and later tasks: these will throw errors, since -it is increasingly likely that they are being used incorrectly, attempting to -change the environment for a single build step, and instead setting it for -hundreds of thousands. +If used during Android.mk files, and later tasks, it is increasingly likely +that they are being used incorrectly. Attempting to change the environment for +a single build step, and instead setting it for hundreds of thousands. It is not recommended to just move the environment variable setting outside of the build (in vendorsetup.sh, or some other configuration script or wrapper). diff --git a/Deprecation.md b/Deprecation.md index 0d925cbc58..131ec0d11d 100644 --- a/Deprecation.md +++ b/Deprecation.md @@ -14,16 +14,16 @@ have any problems converting, please contact us via: | Module type | State | | -------------------------------- | --------- | -| `BUILD_AUX_EXECUTABLE` | Warning | -| `BUILD_AUX_STATIC_LIBRARY` | Warning | -| `BUILD_HOST_FUZZ_TEST` | Warning | -| `BUILD_HOST_NATIVE_TEST` | Warning | +| `BUILD_AUX_EXECUTABLE` | Error | +| `BUILD_AUX_STATIC_LIBRARY` | Error | +| `BUILD_HOST_FUZZ_TEST` | Error | +| `BUILD_HOST_NATIVE_TEST` | Error | | `BUILD_HOST_SHARED_TEST_LIBRARY` | Error | -| `BUILD_HOST_STATIC_TEST_LIBRARY` | Warning | +| `BUILD_HOST_STATIC_TEST_LIBRARY` | Error | | `BUILD_HOST_TEST_CONFIG` | Error | -| `BUILD_NATIVE_BENCHMARK` | Warning | +| `BUILD_NATIVE_BENCHMARK` | Error | | `BUILD_SHARED_TEST_LIBRARY` | Error | -| `BUILD_STATIC_TEST_LIBRARY` | Warning | +| `BUILD_STATIC_TEST_LIBRARY` | Error | | `BUILD_TARGET_TEST_CONFIG` | Error | | `BUILD_*` | Available | diff --git a/core/Makefile b/core/Makefile index f92e25a769..a4825e1d5a 100644 --- a/core/Makefile +++ b/core/Makefile @@ -1224,19 +1224,9 @@ endif # TARGET_BUILD_APPS # The kernel isn't really a module, so to get its module file in there, we # make the target NOTICE files depend on this particular file too, which will # then be in the right directory for the find in combine-notice-files to work. -$(kernel_notice_file): \ - $(BUILD_SYSTEM)/LINUX_KERNEL_COPYING \ - | $(ACP) - @echo Copying: $@ - $(hide) mkdir -p $(dir $@) - $(hide) $(ACP) $< $@ +$(eval $(call copy-one-file,$(BUILD_SYSTEM)/LINUX_KERNEL_COPYING,$(kernel_notice_file))) -$(winpthreads_notice_file): \ - $(BUILD_SYSTEM)/WINPTHREADS_COPYING \ - | $(ACP) - @echo Copying: $@ - $(hide) mkdir -p $(dir $@) - $(hide) $(ACP) $< $@ +$(eval $(call copy-one-file,$(BUILD_SYSTEM)/WINPTHREADS_COPYING,$(winpthreads_notice_file))) # ################################################################# @@ -4081,7 +4071,7 @@ endif endif ifeq ($(BREAKPAD_GENERATE_SYMBOLS),true) @# If breakpad symbols have been generated, add them to the zip. - $(hide) $(ACP) -r $(TARGET_OUT_BREAKPAD) $(zip_root)/BREAKPAD + $(hide) cp -R $(TARGET_OUT_BREAKPAD) $(zip_root)/BREAKPAD endif ifdef BOARD_PREBUILT_VENDORIMAGE $(hide) mkdir -p $(zip_root)/IMAGES diff --git a/core/base_rules.mk b/core/base_rules.mk index 94aa1e4a92..ed5820bf3d 100644 --- a/core/base_rules.mk +++ b/core/base_rules.mk @@ -167,19 +167,14 @@ ifdef my_bad_module_tags ifeq (true,$(LOCAL_UNINSTALLABLE_MODULE)) $(call pretty-warning,LOCAL_MODULE_TAGS := $(my_bad_module_tags) does not do anything for uninstallable modules) endif - ifneq ($(BUILD_BROKEN_ENG_DEBUG_TAGS),true) - $(call pretty-error,LOCAL_MODULE_TAGS := $(my_bad_module_tags) is obsolete. See $(CHANGES_URL)#LOCAL_MODULE_TAGS) - else - $(call pretty-warning,LOCAL_MODULE_TAGS := $(my_bad_module_tags) is deprecated. See $(CHANGES_URL)#LOCAL_MODULE_TAGS) - endif - my_bad_module_tags := + $(call pretty-error,LOCAL_MODULE_TAGS := $(my_bad_module_tags) is obsolete. See $(CHANGES_URL)#LOCAL_MODULE_TAGS) endif # Only the tags mentioned in this test are expected to be set by module # makefiles. Anything else is either a typo or a source of unexpected # behaviors. -ifneq ($(filter-out debug eng tests optional samples,$(my_module_tags)),) -$(call pretty-error,unusual tags: $(filter-out debug eng tests optional samples,$(my_module_tags))) +ifneq ($(filter-out tests optional samples,$(my_module_tags)),) +$(call pretty-error,unusual tags: $(filter-out tests optional samples,$(my_module_tags))) endif # Add implicit tags. diff --git a/core/board_config.mk b/core/board_config.mk index e14ba00da1..9c9e8b18c7 100644 --- a/core/board_config.mk +++ b/core/board_config.mk @@ -85,9 +85,7 @@ _dynamic_partitions_var_list += \ _board_strip_readonly_list += $(_dynamic_partitions_var_list) _build_broken_var_list := \ - BUILD_BROKEN_ANDROIDMK_EXPORTS \ BUILD_BROKEN_DUP_RULES \ - BUILD_BROKEN_ENG_DEBUG_TAGS \ BUILD_BROKEN_USES_NETWORK \ _build_broken_var_list += \ @@ -230,10 +228,6 @@ TARGET_CPU_ABI_LIST := $(subst $(space),$(comma),$(strip $(TARGET_CPU_ABI_LIST)) TARGET_CPU_ABI_LIST_32_BIT := $(subst $(space),$(comma),$(strip $(TARGET_CPU_ABI_LIST_32_BIT))) TARGET_CPU_ABI_LIST_64_BIT := $(subst $(space),$(comma),$(strip $(TARGET_CPU_ABI_LIST_64_BIT))) -ifneq ($(BUILD_BROKEN_ANDROIDMK_EXPORTS),true) -$(KATI_obsolete_export It is a global setting. See $(CHANGES_URL)#export_keyword) -endif - ########################################### # Now we can substitute with the real value of TARGET_COPY_OUT_RAMDISK ifeq ($(BOARD_BUILD_SYSTEM_ROOT_IMAGE),true) diff --git a/core/clear_vars.mk b/core/clear_vars.mk index fafdce68cc..5973e0e3c9 100644 --- a/core/clear_vars.mk +++ b/core/clear_vars.mk @@ -269,6 +269,7 @@ LOCAL_SOONG_STATIC_LIBRARY_EXTRA_PACKAGES := LOCAL_SOONG_SYMBOL_PATH := LOCAL_SOONG_TOC := LOCAL_SOONG_UNSTRIPPED_BINARY := +LOCAL_SOONG_VNDK_VERSION := # '',true LOCAL_SOURCE_FILES_ALL_GENERATED:= LOCAL_SRC_FILES:= diff --git a/core/config.mk b/core/config.mk index 25b90de99e..6830475324 100644 --- a/core/config.mk +++ b/core/config.mk @@ -97,9 +97,9 @@ $(KATI_obsolete_var TARGET_ROOT_OUT_SBIN,/sbin has been removed, use /system/bin $(KATI_obsolete_var TARGET_ROOT_OUT_SBIN_UNSTRIPPED,/sbin has been removed, use /system/bin instead) $(KATI_obsolete_var BUILD_BROKEN_PHONY_TARGETS) $(KATI_obsolete_var BUILD_BROKEN_DUP_COPY_HEADERS) - -# This is marked as obsolete in envsetup.mk after reading the BoardConfig.mk -$(KATI_deprecate_export It is a global setting. See $(CHANGES_URL)#export_keyword) +$(KATI_obsolete_var BUILD_BROKEN_ENG_DEBUG_TAGS) +$(KATI_obsolete_export It is a global setting. See $(CHANGES_URL)#export_keyword) +$(KATI_obsolete_var BUILD_BROKEN_ANDROIDMK_EXPORTS) # Used to force goals to build. Only use for conditionally defined goals. .PHONY: FORCE diff --git a/core/definitions.mk b/core/definitions.mk index af6248d4e6..f8c6ec862d 100644 --- a/core/definitions.mk +++ b/core/definitions.mk @@ -425,8 +425,8 @@ endef define find-subdir-assets $(sort $(if $(1),$(patsubst ./%,%, \ - $(shell if [ -d $(1) ] ; then cd $(1) ; find -L ./ -not -name '.*' -and -type f ; fi)), \ - $(warning Empty argument supplied to find-subdir-assets in $(LOCAL_PATH)) \ + $(shell if [ -d $(1) ] ; then cd $(1) ; find -L ./ -not -name '.*' -and -type f ; fi)), \ + $(warning Empty argument supplied to find-subdir-assets in $(LOCAL_PATH)) \ )) endef @@ -782,8 +782,8 @@ endef #TODO(jbq): as of 20100106 nobody uses the second parameter define get-tagged-modules $(filter-out \ - $(call modules-for-tag-list,$(2)), \ - $(call modules-for-tag-list,$(1))) + $(call modules-for-tag-list,$(2)), \ + $(call modules-for-tag-list,$(1))) endef ########################################################### @@ -950,16 +950,16 @@ define transform-bc-to-so @echo "Renderscript compatibility: $(notdir $@) <= $(notdir $<)" $(hide) mkdir -p $(dir $@) $(hide) $(BCC_COMPAT) -O3 -o $(dir $@)/$(notdir $(<:.bc=.o)) -fPIC -shared \ - -rt-path $(RS_PREBUILT_CLCORE) -mtriple $(RS_COMPAT_TRIPLE) $< + -rt-path $(RS_PREBUILT_CLCORE) -mtriple $(RS_COMPAT_TRIPLE) $< $(hide) $(PRIVATE_CXX) -shared -Wl,-soname,$(notdir $@) -nostdlib \ - -Wl,-rpath,\$$ORIGIN/../lib \ - $(dir $@)/$(notdir $(<:.bc=.o)) \ - $(RS_PREBUILT_COMPILER_RT) \ - -o $@ $(CLANG_TARGET_GLOBAL_LDFLAGS) -Wl,--hash-style=sysv \ - -L $(SOONG_OUT_DIR)/ndk/platforms/android-$(PRIVATE_SDK_VERSION)/arch-$(TARGET_ARCH)/usr/lib64 \ - -L $(SOONG_OUT_DIR)/ndk/platforms/android-$(PRIVATE_SDK_VERSION)/arch-$(TARGET_ARCH)/usr/lib \ - $(call intermediates-dir-for,SHARED_LIBRARIES,libRSSupport)/libRSSupport.so \ - -lm -lc + -Wl,-rpath,\$$ORIGIN/../lib \ + $(dir $@)/$(notdir $(<:.bc=.o)) \ + $(RS_PREBUILT_COMPILER_RT) \ + -o $@ $(CLANG_TARGET_GLOBAL_LDFLAGS) -Wl,--hash-style=sysv \ + -L $(SOONG_OUT_DIR)/ndk/platforms/android-$(PRIVATE_SDK_VERSION)/arch-$(TARGET_ARCH)/usr/lib64 \ + -L $(SOONG_OUT_DIR)/ndk/platforms/android-$(PRIVATE_SDK_VERSION)/arch-$(TARGET_ARCH)/usr/lib \ + $(call intermediates-dir-for,SHARED_LIBRARIES,libRSSupport)/libRSSupport.so \ + -lm -lc endef ########################################################### @@ -1093,10 +1093,10 @@ define transform-proto-to-cc @echo "Protoc: $@ <= $<" @mkdir -p $(dir $@) $(hide) \ - $(PROTOC) \ - $(addprefix --proto_path=, $(PRIVATE_PROTO_INCLUDES)) \ - $(PRIVATE_PROTOC_FLAGS) \ - $< + $(PROTOC) \ + $(addprefix --proto_path=, $(PRIVATE_PROTO_INCLUDES)) \ + $(PRIVATE_PROTOC_FLAGS) \ + $< @# aprotoc outputs only .cc. Rename it to .cpp if necessary. $(if $(PRIVATE_RENAME_CPP_EXT),\ $(hide) mv $(basename $@).cc $@) @@ -1122,19 +1122,19 @@ endef ########################################################### define transform-cpp-to-o-compiler-args - $(c-includes) \ - -c \ - $(if $(PRIVATE_NO_DEFAULT_COMPILER_FLAGS),, \ - $(PRIVATE_TARGET_GLOBAL_CFLAGS) \ - $(PRIVATE_TARGET_GLOBAL_CPPFLAGS) \ - $(PRIVATE_ARM_CFLAGS) \ - ) \ - $(PRIVATE_RTTI_FLAG) \ - $(PRIVATE_CFLAGS) \ - $(PRIVATE_CPPFLAGS) \ - $(PRIVATE_DEBUG_CFLAGS) \ - $(PRIVATE_CFLAGS_NO_OVERRIDE) \ - $(PRIVATE_CPPFLAGS_NO_OVERRIDE) +$(c-includes) \ +-c \ +$(if $(PRIVATE_NO_DEFAULT_COMPILER_FLAGS),, \ + $(PRIVATE_TARGET_GLOBAL_CFLAGS) \ + $(PRIVATE_TARGET_GLOBAL_CPPFLAGS) \ + $(PRIVATE_ARM_CFLAGS) \ + ) \ +$(PRIVATE_RTTI_FLAG) \ +$(PRIVATE_CFLAGS) \ +$(PRIVATE_CPPFLAGS) \ +$(PRIVATE_DEBUG_CFLAGS) \ +$(PRIVATE_CFLAGS_NO_OVERRIDE) \ +$(PRIVATE_CPPFLAGS_NO_OVERRIDE) endef # PATH_TO_CLANG_TIDY is defined in build/soong @@ -1172,14 +1172,14 @@ endif # $(1): extra flags define transform-c-or-s-to-o-compiler-args - $(c-includes) \ - -c \ - $(if $(PRIVATE_NO_DEFAULT_COMPILER_FLAGS),, \ - $(PRIVATE_TARGET_GLOBAL_CFLAGS) \ - $(PRIVATE_TARGET_GLOBAL_CONLYFLAGS) \ - $(PRIVATE_ARM_CFLAGS) \ - ) \ - $(1) +$(c-includes) \ +-c \ +$(if $(PRIVATE_NO_DEFAULT_COMPILER_FLAGS),, \ + $(PRIVATE_TARGET_GLOBAL_CFLAGS) \ + $(PRIVATE_TARGET_GLOBAL_CONLYFLAGS) \ + $(PRIVATE_ARM_CFLAGS) \ + ) \ + $(1) endef define transform-c-to-o-compiler-args @@ -1245,17 +1245,17 @@ endef ########################################################### define transform-host-cpp-to-o-compiler-args - $(c-includes) \ - -c \ - $(if $(PRIVATE_NO_DEFAULT_COMPILER_FLAGS),, \ - $(PRIVATE_HOST_GLOBAL_CFLAGS) \ - $(PRIVATE_HOST_GLOBAL_CPPFLAGS) \ - ) \ - $(PRIVATE_CFLAGS) \ - $(PRIVATE_CPPFLAGS) \ - $(PRIVATE_DEBUG_CFLAGS) \ - $(PRIVATE_CFLAGS_NO_OVERRIDE) \ - $(PRIVATE_CPPFLAGS_NO_OVERRIDE) +$(c-includes) \ +-c \ +$(if $(PRIVATE_NO_DEFAULT_COMPILER_FLAGS),, \ + $(PRIVATE_HOST_GLOBAL_CFLAGS) \ + $(PRIVATE_HOST_GLOBAL_CPPFLAGS) \ + ) \ +$(PRIVATE_CFLAGS) \ +$(PRIVATE_CPPFLAGS) \ +$(PRIVATE_DEBUG_CFLAGS) \ +$(PRIVATE_CFLAGS_NO_OVERRIDE) \ +$(PRIVATE_CPPFLAGS_NO_OVERRIDE) endef define clang-tidy-host-cpp @@ -1285,12 +1285,12 @@ endif ########################################################### define transform-host-c-or-s-to-o-common-args - $(c-includes) \ - -c \ - $(if $(PRIVATE_NO_DEFAULT_COMPILER_FLAGS),, \ - $(PRIVATE_HOST_GLOBAL_CFLAGS) \ - $(PRIVATE_HOST_GLOBAL_CONLYFLAGS) \ - ) +$(c-includes) \ +-c \ +$(if $(PRIVATE_NO_DEFAULT_COMPILER_FLAGS),, \ + $(PRIVATE_HOST_GLOBAL_CFLAGS) \ + $(PRIVATE_HOST_GLOBAL_CONLYFLAGS) \ + ) endef # $(1): extra flags @@ -1534,15 +1534,15 @@ endef define transform-o-to-aux-executable-inner $(hide) $(PRIVATE_CXX) -pie \ - -Bdynamic \ - -Wl,--gc-sections \ - $(PRIVATE_ALL_OBJECTS) \ - -Wl,--whole-archive \ - $(PRIVATE_ALL_WHOLE_STATIC_LIBRARIES) \ - -Wl,--no-whole-archive \ - $(PRIVATE_ALL_STATIC_LIBRARIES) \ - $(PRIVATE_LDFLAGS) \ - -o $@ + -Bdynamic \ + -Wl,--gc-sections \ + $(PRIVATE_ALL_OBJECTS) \ + -Wl,--whole-archive \ + $(PRIVATE_ALL_WHOLE_STATIC_LIBRARIES) \ + -Wl,--no-whole-archive \ + $(PRIVATE_ALL_STATIC_LIBRARIES) \ + $(PRIVATE_LDFLAGS) \ + -o $@ endef define transform-o-to-aux-executable @@ -1553,16 +1553,16 @@ endef define transform-o-to-aux-static-executable-inner $(hide) $(PRIVATE_CXX) \ - -Bstatic \ - -Wl,--gc-sections \ - $(PRIVATE_ALL_OBJECTS) \ - -Wl,--whole-archive \ - $(PRIVATE_ALL_WHOLE_STATIC_LIBRARIES) \ - -Wl,--no-whole-archive \ - $(PRIVATE_ALL_STATIC_LIBRARIES) \ - $(PRIVATE_LDFLAGS) \ - -Wl,-Map=$(@).map \ - -o $@ + -Bstatic \ + -Wl,--gc-sections \ + $(PRIVATE_ALL_OBJECTS) \ + -Wl,--whole-archive \ + $(PRIVATE_ALL_WHOLE_STATIC_LIBRARIES) \ + -Wl,--no-whole-archive \ + $(PRIVATE_ALL_STATIC_LIBRARIES) \ + $(PRIVATE_LDFLAGS) \ + -Wl,-Map=$(@).map \ + -o $@ endef define transform-o-to-aux-static-executable @@ -1654,25 +1654,25 @@ endef ifneq ($(HOST_CUSTOM_LD_COMMAND),true) define transform-host-o-to-shared-lib-inner $(hide) $(PRIVATE_CXX) \ - -Wl,-rpath,\$$ORIGIN/../$(notdir $($(PRIVATE_2ND_ARCH_VAR_PREFIX)$(PRIVATE_PREFIX)OUT_SHARED_LIBRARIES)) \ - -Wl,-rpath,\$$ORIGIN/$(notdir $($(PRIVATE_2ND_ARCH_VAR_PREFIX)$(PRIVATE_PREFIX)OUT_SHARED_LIBRARIES)) \ - -shared -Wl,-soname,$(notdir $@) \ - $(if $(PRIVATE_NO_DEFAULT_COMPILER_FLAGS),, \ - $(PRIVATE_HOST_GLOBAL_LDFLAGS) \ - ) \ - $(PRIVATE_LDFLAGS) \ - $(PRIVATE_ALL_OBJECTS) \ - -Wl,--whole-archive \ - $(PRIVATE_ALL_WHOLE_STATIC_LIBRARIES) \ - -Wl,--no-whole-archive \ - $(if $(PRIVATE_GROUP_STATIC_LIBRARIES),-Wl$(comma)--start-group) \ - $(PRIVATE_ALL_STATIC_LIBRARIES) \ - $(if $(PRIVATE_GROUP_STATIC_LIBRARIES),-Wl$(comma)--end-group) \ - $(if $(filter true,$(NATIVE_COVERAGE)),-lgcov) \ - $(if $(filter true,$(NATIVE_COVERAGE)),$(PRIVATE_HOST_LIBPROFILE_RT)) \ - $(PRIVATE_ALL_SHARED_LIBRARIES) \ - -o $@ \ - $(PRIVATE_LDLIBS) + -Wl,-rpath,\$$ORIGIN/../$(notdir $($(PRIVATE_2ND_ARCH_VAR_PREFIX)$(PRIVATE_PREFIX)OUT_SHARED_LIBRARIES)) \ + -Wl,-rpath,\$$ORIGIN/$(notdir $($(PRIVATE_2ND_ARCH_VAR_PREFIX)$(PRIVATE_PREFIX)OUT_SHARED_LIBRARIES)) \ + -shared -Wl,-soname,$(notdir $@) \ + $(if $(PRIVATE_NO_DEFAULT_COMPILER_FLAGS),, \ + $(PRIVATE_HOST_GLOBAL_LDFLAGS) \ + ) \ + $(PRIVATE_LDFLAGS) \ + $(PRIVATE_ALL_OBJECTS) \ + -Wl,--whole-archive \ + $(PRIVATE_ALL_WHOLE_STATIC_LIBRARIES) \ + -Wl,--no-whole-archive \ + $(if $(PRIVATE_GROUP_STATIC_LIBRARIES),-Wl$(comma)--start-group) \ + $(PRIVATE_ALL_STATIC_LIBRARIES) \ + $(if $(PRIVATE_GROUP_STATIC_LIBRARIES),-Wl$(comma)--end-group) \ + $(if $(filter true,$(NATIVE_COVERAGE)),-lgcov) \ + $(if $(filter true,$(NATIVE_COVERAGE)),$(PRIVATE_HOST_LIBPROFILE_RT)) \ + $(PRIVATE_ALL_SHARED_LIBRARIES) \ + -o $@ \ + $(PRIVATE_LDLIBS) endef endif @@ -1695,27 +1695,27 @@ endef define transform-o-to-shared-lib-inner $(hide) $(PRIVATE_CXX) \ - -nostdlib -Wl,-soname,$(notdir $@) \ - -Wl,--gc-sections \ - -shared \ - $(PRIVATE_TARGET_CRTBEGIN_SO_O) \ - $(PRIVATE_ALL_OBJECTS) \ - -Wl,--whole-archive \ - $(PRIVATE_ALL_WHOLE_STATIC_LIBRARIES) \ - -Wl,--no-whole-archive \ - $(if $(PRIVATE_GROUP_STATIC_LIBRARIES),-Wl$(comma)--start-group) \ - $(PRIVATE_ALL_STATIC_LIBRARIES) \ - $(if $(PRIVATE_GROUP_STATIC_LIBRARIES),-Wl$(comma)--end-group) \ - $(if $(filter true,$(NATIVE_COVERAGE)),$(PRIVATE_TARGET_COVERAGE_LIB)) \ - $(PRIVATE_TARGET_LIBCRT_BUILTINS) \ - $(PRIVATE_TARGET_LIBATOMIC) \ - $(PRIVATE_TARGET_LIBGCC) \ - $(PRIVATE_TARGET_GLOBAL_LDFLAGS) \ - $(PRIVATE_LDFLAGS) \ - $(PRIVATE_ALL_SHARED_LIBRARIES) \ - -o $@ \ - $(PRIVATE_TARGET_CRTEND_SO_O) \ - $(PRIVATE_LDLIBS) + -nostdlib -Wl,-soname,$(notdir $@) \ + -Wl,--gc-sections \ + -shared \ + $(PRIVATE_TARGET_CRTBEGIN_SO_O) \ + $(PRIVATE_ALL_OBJECTS) \ + -Wl,--whole-archive \ + $(PRIVATE_ALL_WHOLE_STATIC_LIBRARIES) \ + -Wl,--no-whole-archive \ + $(if $(PRIVATE_GROUP_STATIC_LIBRARIES),-Wl$(comma)--start-group) \ + $(PRIVATE_ALL_STATIC_LIBRARIES) \ + $(if $(PRIVATE_GROUP_STATIC_LIBRARIES),-Wl$(comma)--end-group) \ + $(if $(filter true,$(NATIVE_COVERAGE)),$(PRIVATE_TARGET_COVERAGE_LIB)) \ + $(PRIVATE_TARGET_LIBCRT_BUILTINS) \ + $(PRIVATE_TARGET_LIBATOMIC) \ + $(PRIVATE_TARGET_LIBGCC) \ + $(PRIVATE_TARGET_GLOBAL_LDFLAGS) \ + $(PRIVATE_LDFLAGS) \ + $(PRIVATE_ALL_SHARED_LIBRARIES) \ + -o $@ \ + $(PRIVATE_TARGET_CRTEND_SO_O) \ + $(PRIVATE_LDLIBS) endef define transform-o-to-shared-lib @@ -1730,28 +1730,28 @@ endef define transform-o-to-executable-inner $(hide) $(PRIVATE_CXX) -pie \ - -nostdlib -Bdynamic \ - -Wl,-dynamic-linker,$(PRIVATE_LINKER) \ - -Wl,--gc-sections \ - -Wl,-z,nocopyreloc \ - $(PRIVATE_TARGET_CRTBEGIN_DYNAMIC_O) \ - $(PRIVATE_ALL_OBJECTS) \ - -Wl,--whole-archive \ - $(PRIVATE_ALL_WHOLE_STATIC_LIBRARIES) \ - -Wl,--no-whole-archive \ - $(if $(PRIVATE_GROUP_STATIC_LIBRARIES),-Wl$(comma)--start-group) \ - $(PRIVATE_ALL_STATIC_LIBRARIES) \ - $(if $(PRIVATE_GROUP_STATIC_LIBRARIES),-Wl$(comma)--end-group) \ - $(if $(filter true,$(NATIVE_COVERAGE)),$(PRIVATE_TARGET_COVERAGE_LIB)) \ - $(PRIVATE_TARGET_LIBCRT_BUILTINS) \ - $(PRIVATE_TARGET_LIBATOMIC) \ - $(PRIVATE_TARGET_LIBGCC) \ - $(PRIVATE_TARGET_GLOBAL_LDFLAGS) \ - $(PRIVATE_LDFLAGS) \ - $(PRIVATE_ALL_SHARED_LIBRARIES) \ - -o $@ \ - $(PRIVATE_TARGET_CRTEND_O) \ - $(PRIVATE_LDLIBS) + -nostdlib -Bdynamic \ + -Wl,-dynamic-linker,$(PRIVATE_LINKER) \ + -Wl,--gc-sections \ + -Wl,-z,nocopyreloc \ + $(PRIVATE_TARGET_CRTBEGIN_DYNAMIC_O) \ + $(PRIVATE_ALL_OBJECTS) \ + -Wl,--whole-archive \ + $(PRIVATE_ALL_WHOLE_STATIC_LIBRARIES) \ + -Wl,--no-whole-archive \ + $(if $(PRIVATE_GROUP_STATIC_LIBRARIES),-Wl$(comma)--start-group) \ + $(PRIVATE_ALL_STATIC_LIBRARIES) \ + $(if $(PRIVATE_GROUP_STATIC_LIBRARIES),-Wl$(comma)--end-group) \ + $(if $(filter true,$(NATIVE_COVERAGE)),$(PRIVATE_TARGET_COVERAGE_LIB)) \ + $(PRIVATE_TARGET_LIBCRT_BUILTINS) \ + $(PRIVATE_TARGET_LIBATOMIC) \ + $(PRIVATE_TARGET_LIBGCC) \ + $(PRIVATE_TARGET_GLOBAL_LDFLAGS) \ + $(PRIVATE_LDFLAGS) \ + $(PRIVATE_ALL_SHARED_LIBRARIES) \ + -o $@ \ + $(PRIVATE_TARGET_CRTEND_O) \ + $(PRIVATE_LDLIBS) endef define transform-o-to-executable @@ -1773,28 +1773,28 @@ endef define transform-o-to-static-executable-inner $(hide) $(PRIVATE_CXX) \ - -nostdlib -Bstatic \ - $(if $(filter $(PRIVATE_LDFLAGS),-shared),,-static) \ - -Wl,--gc-sections \ - -o $@ \ - $(PRIVATE_TARGET_CRTBEGIN_STATIC_O) \ - $(PRIVATE_TARGET_GLOBAL_LDFLAGS) \ - $(PRIVATE_LDFLAGS) \ - $(PRIVATE_ALL_OBJECTS) \ - -Wl,--whole-archive \ - $(PRIVATE_ALL_WHOLE_STATIC_LIBRARIES) \ - -Wl,--no-whole-archive \ - $(filter-out %libcompiler_rt.hwasan.a %libc_nomalloc.hwasan.a %libc.hwasan.a %libcompiler_rt.a %libc_nomalloc.a %libc.a,$(PRIVATE_ALL_STATIC_LIBRARIES)) \ - -Wl,--start-group \ - $(filter %libc.a %libc.hwasan.a,$(PRIVATE_ALL_STATIC_LIBRARIES)) \ - $(filter %libc_nomalloc.a %libc_nomalloc.hwasan.a,$(PRIVATE_ALL_STATIC_LIBRARIES)) \ - $(if $(filter true,$(NATIVE_COVERAGE)),$(PRIVATE_TARGET_COVERAGE_LIB)) \ - $(PRIVATE_TARGET_LIBATOMIC) \ - $(filter %libcompiler_rt.a %libcompiler_rt.hwasan.a,$(PRIVATE_ALL_STATIC_LIBRARIES)) \ - $(PRIVATE_TARGET_LIBCRT_BUILTINS) \ - $(PRIVATE_TARGET_LIBGCC) \ - -Wl,--end-group \ - $(PRIVATE_TARGET_CRTEND_O) + -nostdlib -Bstatic \ + $(if $(filter $(PRIVATE_LDFLAGS),-shared),,-static) \ + -Wl,--gc-sections \ + -o $@ \ + $(PRIVATE_TARGET_CRTBEGIN_STATIC_O) \ + $(PRIVATE_TARGET_GLOBAL_LDFLAGS) \ + $(PRIVATE_LDFLAGS) \ + $(PRIVATE_ALL_OBJECTS) \ + -Wl,--whole-archive \ + $(PRIVATE_ALL_WHOLE_STATIC_LIBRARIES) \ + -Wl,--no-whole-archive \ + $(filter-out %libcompiler_rt.hwasan.a %libc_nomalloc.hwasan.a %libc.hwasan.a %libcompiler_rt.a %libc_nomalloc.a %libc.a,$(PRIVATE_ALL_STATIC_LIBRARIES)) \ + -Wl,--start-group \ + $(filter %libc.a %libc.hwasan.a,$(PRIVATE_ALL_STATIC_LIBRARIES)) \ + $(filter %libc_nomalloc.a %libc_nomalloc.hwasan.a,$(PRIVATE_ALL_STATIC_LIBRARIES)) \ + $(if $(filter true,$(NATIVE_COVERAGE)),$(PRIVATE_TARGET_COVERAGE_LIB)) \ + $(PRIVATE_TARGET_LIBATOMIC) \ + $(filter %libcompiler_rt.a %libcompiler_rt.hwasan.a,$(PRIVATE_ALL_STATIC_LIBRARIES)) \ + $(PRIVATE_TARGET_LIBCRT_BUILTINS) \ + $(PRIVATE_TARGET_LIBGCC) \ + -Wl,--end-group \ + $(PRIVATE_TARGET_CRTEND_O) endef define transform-o-to-static-executable @@ -1811,24 +1811,24 @@ endef ifneq ($(HOST_CUSTOM_LD_COMMAND),true) define transform-host-o-to-executable-inner $(hide) $(PRIVATE_CXX) \ - $(PRIVATE_ALL_OBJECTS) \ - -Wl,--whole-archive \ - $(PRIVATE_ALL_WHOLE_STATIC_LIBRARIES) \ - -Wl,--no-whole-archive \ - $(if $(PRIVATE_GROUP_STATIC_LIBRARIES),-Wl$(comma)--start-group) \ - $(PRIVATE_ALL_STATIC_LIBRARIES) \ - $(if $(PRIVATE_GROUP_STATIC_LIBRARIES),-Wl$(comma)--end-group) \ - $(if $(filter true,$(NATIVE_COVERAGE)),-lgcov) \ - $(if $(filter true,$(NATIVE_COVERAGE)),$(PRIVATE_HOST_LIBPROFILE_RT)) \ - $(PRIVATE_ALL_SHARED_LIBRARIES) \ - $(foreach path,$(PRIVATE_RPATHS), \ - -Wl,-rpath,\$$ORIGIN/$(path)) \ - $(if $(PRIVATE_NO_DEFAULT_COMPILER_FLAGS),, \ - $(PRIVATE_HOST_GLOBAL_LDFLAGS) \ - ) \ - $(PRIVATE_LDFLAGS) \ - -o $@ \ - $(PRIVATE_LDLIBS) + $(PRIVATE_ALL_OBJECTS) \ + -Wl,--whole-archive \ + $(PRIVATE_ALL_WHOLE_STATIC_LIBRARIES) \ + -Wl,--no-whole-archive \ + $(if $(PRIVATE_GROUP_STATIC_LIBRARIES),-Wl$(comma)--start-group) \ + $(PRIVATE_ALL_STATIC_LIBRARIES) \ + $(if $(PRIVATE_GROUP_STATIC_LIBRARIES),-Wl$(comma)--end-group) \ + $(if $(filter true,$(NATIVE_COVERAGE)),-lgcov) \ + $(if $(filter true,$(NATIVE_COVERAGE)),$(PRIVATE_HOST_LIBPROFILE_RT)) \ + $(PRIVATE_ALL_SHARED_LIBRARIES) \ + $(foreach path,$(PRIVATE_RPATHS), \ + -Wl,-rpath,\$$ORIGIN/$(path)) \ + $(if $(PRIVATE_NO_DEFAULT_COMPILER_FLAGS),, \ + $(PRIVATE_HOST_GLOBAL_LDFLAGS) \ + ) \ + $(PRIVATE_LDFLAGS) \ + -o $@ \ + $(PRIVATE_LDLIBS) endef endif @@ -1853,15 +1853,15 @@ $(hide) for GENERATED_MANIFEST_FILE in `find $(1) \ -name Manifest.java 2> /dev/null`; do \ dir=`awk '/package/{gsub(/\./,"/",$$2);gsub(/;/,"",$$2);print $$2;exit}' $$GENERATED_MANIFEST_FILE`; \ mkdir -p $(TARGET_COMMON_OUT_ROOT)/R/$$dir; \ - $(ACP) -fp $$GENERATED_MANIFEST_FILE $(TARGET_COMMON_OUT_ROOT)/R/$$dir; \ + cp $$GENERATED_MANIFEST_FILE $(TARGET_COMMON_OUT_ROOT)/R/$$dir; \ done; $(hide) for GENERATED_R_FILE in `find $(1) \ -name R.java 2> /dev/null`; do \ dir=`awk '/package/{gsub(/\./,"/",$$2);gsub(/;/,"",$$2);print $$2;exit}' $$GENERATED_R_FILE`; \ mkdir -p $(TARGET_COMMON_OUT_ROOT)/R/$$dir; \ - $(ACP) -fp $$GENERATED_R_FILE $(TARGET_COMMON_OUT_ROOT)/R/$$dir \ + cp $$GENERATED_R_FILE $(TARGET_COMMON_OUT_ROOT)/R/$$dir \ || exit 31; \ - $(ACP) -fp $$GENERATED_R_FILE $(2) || exit 32; \ + cp $$GENERATED_R_FILE $(2) || exit 32; \ done; @# Ensure that the target file is always created, i.e. also in case we did not @# enter the GENERATED_R_FILE-loop above. This avoids unnecessary rebuilding. @@ -3323,7 +3323,7 @@ LIBRARY_IDENTITY_CHECK_SCRIPT := build/make/tools/check_identical_lib.sh define verify-vndk-libs-identical @echo "Checking VNDK vendor variant: $(2)" $(hide) CLANG_BIN="$(LLVM_PREBUILTS_PATH)" \ - CROSS_COMPILE="$(strip $(3))" \ - XZ="$(XZ)" \ - $(LIBRARY_IDENTITY_CHECK_SCRIPT) $(SOONG_STRIP_PATH) $(1) $(2) + CROSS_COMPILE="$(strip $(3))" \ + XZ="$(XZ)" \ + $(LIBRARY_IDENTITY_CHECK_SCRIPT) $(SOONG_STRIP_PATH) $(1) $(2) endef diff --git a/core/deprecation.mk b/core/deprecation.mk index 11fe290bd5..f1e198d518 100644 --- a/core/deprecation.mk +++ b/core/deprecation.mk @@ -28,19 +28,19 @@ AVAILABLE_BUILD_MODULE_TYPES :=$= \ # relevant BUILD_BROKEN_USES_BUILD_* variables, then these would move to # DEFAULT_ERROR_BUILD_MODULE_TYPES. DEFAULT_WARNING_BUILD_MODULE_TYPES :=$= \ + +# These are BUILD_* variables that are errors to reference, but you can set +# BUILD_BROKEN_USES_BUILD_* in your BoardConfig.mk in order to turn them back +# to warnings. +DEFAULT_ERROR_BUILD_MODULE_TYPES :=$= \ BUILD_AUX_EXECUTABLE \ BUILD_AUX_STATIC_LIBRARY \ BUILD_HOST_FUZZ_TEST \ BUILD_HOST_NATIVE_TEST \ BUILD_HOST_STATIC_TEST_LIBRARY \ + BUILD_HOST_TEST_CONFIG \ BUILD_NATIVE_BENCHMARK \ BUILD_STATIC_TEST_LIBRARY \ - -# These are BUILD_* variables that are errors to reference, but you can set -# BUILD_BROKEN_USES_BUILD_* in your BoardConfig.mk in order to turn them back -# to warnings. -DEFAULT_ERROR_BUILD_MODULE_TYPES :=$= \ - BUILD_HOST_TEST_CONFIG \ BUILD_TARGET_TEST_CONFIG \ # These are BUILD_* variables that are always errors to reference. diff --git a/core/main.mk b/core/main.mk index 94bfd4be55..1afa9504e0 100644 --- a/core/main.mk +++ b/core/main.mk @@ -1450,7 +1450,6 @@ modules_to_install := $(sort \ $(ALL_DEFAULT_INSTALLED_MODULES) \ $(product_target_FILES) \ $(product_host_FILES) \ - $(call get-tagged-modules,$(tags_to_install)) \ $(CUSTOM_MODULES) \ ) @@ -1613,6 +1612,7 @@ droidcore: $(filter $(HOST_OUT_ROOT)/%,$(modules_to_install)) \ $(INSTALLED_SYSTEMIMAGE_TARGET) \ $(INSTALLED_RAMDISK_TARGET) \ $(INSTALLED_BOOTIMAGE_TARGET) \ + $(INSTALLED_RADIOIMAGE_TARGET) \ $(INSTALLED_DEBUG_RAMDISK_TARGET) \ $(INSTALLED_DEBUG_BOOTIMAGE_TARGET) \ $(INSTALLED_RECOVERYIMAGE_TARGET) \ diff --git a/core/notice_files.mk b/core/notice_files.mk index c3147341b4..6df570eca5 100644 --- a/core/notice_files.mk +++ b/core/notice_files.mk @@ -61,6 +61,9 @@ else # device-obj or host-obj. module_installed_filename := \ $(patsubst $(PRODUCT_OUT)/%,%,$($(LOCAL_2ND_ARCH_VAR_PREFIX)$(my_prefix)OUT_SHARED_LIBRARIES))/$(notdir $(LOCAL_BUILT_MODULE)) + else ifeq ($(LOCAL_MODULE_CLASS),SHARED_LIBRARIES) + # Shared modules may be uninstallable(e.g. TARGET_SKIP_CURRENT_VNDK=true) + module_installed_filename := else ifeq ($(LOCAL_MODULE_CLASS),JAVA_LIBRARIES) # Stick the static java libraries with the regular java libraries. diff --git a/core/package_internal.mk b/core/package_internal.mk index e2d79cd460..d09afafb9c 100644 --- a/core/package_internal.mk +++ b/core/package_internal.mk @@ -549,7 +549,7 @@ $(LOCAL_BUILT_MODULE): PRIVATE_RESOURCE_INTERMEDIATES_DIR := $(intermediates.COM $(LOCAL_BUILT_MODULE) : $(jni_shared_libraries) $(LOCAL_BUILT_MODULE) : $(JAR_ARGS) $(SOONG_ZIP) $(MERGE_ZIPS) $(ZIP2ZIP) $(LOCAL_BUILT_MODULE): PRIVATE_RES_PACKAGE := $(my_res_package) -$(LOCAL_BUILT_MODULE) : $(my_res_package) $(AAPT2) | $(ACP) +$(LOCAL_BUILT_MODULE) : $(my_res_package) $(AAPT2) ifdef LOCAL_COMPRESSED_MODULE $(LOCAL_BUILT_MODULE) : $(MINIGZIP) endif diff --git a/core/soong_cc_prebuilt.mk b/core/soong_cc_prebuilt.mk index 7a8f46e091..55dd077b26 100644 --- a/core/soong_cc_prebuilt.mk +++ b/core/soong_cc_prebuilt.mk @@ -3,6 +3,7 @@ # LOCAL_SOONG_LINK_TYPE # LOCAL_SOONG_TOC # LOCAL_SOONG_UNSTRIPPED_BINARY +# LOCAL_SOONG_VNDK_VERSION : means the version of VNDK where this module belongs ifneq ($(LOCAL_MODULE_MAKEFILE),$(SOONG_ANDROID_MK)) $(call pretty-error,soong_cc_prebuilt.mk may only be used from Soong) @@ -51,6 +52,13 @@ ifndef LOCAL_UNINSTALLABLE_MODULE endif endif +# Don't install modules of current VNDK when it is told so +ifeq ($(TARGET_SKIP_CURRENT_VNDK),true) + ifeq ($(LOCAL_SOONG_VNDK_VERSION),$(PLATFORM_VNDK_VERSION)) + LOCAL_UNINSTALLABLE_MODULE := true + endif +endif + ####################################### include $(BUILD_SYSTEM)/base_rules.mk ####################################### diff --git a/core/soong_config.mk b/core/soong_config.mk index 0b8e961337..ac3cfb32f9 100644 --- a/core/soong_config.mk +++ b/core/soong_config.mk @@ -156,7 +156,7 @@ $(call add_json_list, NamespacesToExport, $(PRODUCT_SOONG_NAMESPA $(call add_json_list, PgoAdditionalProfileDirs, $(PGO_ADDITIONAL_PROFILE_DIRS)) -$(call add_json_list, BoardVendorSepolicyDirs, $(BOARD_SEPOLICY_DIRS)) +$(call add_json_list, BoardVendorSepolicyDirs, $(BOARD_VENDOR_SEPOLICY_DIRS) $(BOARD_SEPOLICY_DIRS)) $(call add_json_list, BoardOdmSepolicyDirs, $(BOARD_ODM_SEPOLICY_DIRS)) $(call add_json_list, BoardPlatPublicSepolicyDirs, $(BOARD_PLAT_PUBLIC_SEPOLICY_DIR)) $(call add_json_list, BoardPlatPrivateSepolicyDirs, $(BOARD_PLAT_PRIVATE_SEPOLICY_DIR)) diff --git a/core/tasks/sdk-addon.mk b/core/tasks/sdk-addon.mk index 93db1de187..62d9aa6dde 100644 --- a/core/tasks/sdk-addon.mk +++ b/core/tasks/sdk-addon.mk @@ -114,20 +114,20 @@ $(full_target): PRIVATE_DOCS_DIRS := $(addprefix $(OUT_DOCS)/, $(doc_modules)) $(full_target): PRIVATE_STAGING_DIR := $(call append-path,$(staging),$(addon_dir_leaf)) -$(full_target): $(sdk_addon_deps) | $(ACP) $(SOONG_ZIP) +$(full_target): $(sdk_addon_deps) | $(SOONG_ZIP) @echo Packaging SDK Addon: $@ $(hide) mkdir -p $(PRIVATE_STAGING_DIR)/docs $(hide) for d in $(PRIVATE_DOCS_DIRS); do \ - $(ACP) -r $$d $(PRIVATE_STAGING_DIR)/docs ;\ + cp -R $$d $(PRIVATE_STAGING_DIR)/docs ;\ done $(hide) mkdir -p $(dir $@) $(hide) $(SOONG_ZIP) -o $@ -C $(dir $(PRIVATE_STAGING_DIR)) -D $(PRIVATE_STAGING_DIR) $(full_target_img): PRIVATE_STAGING_DIR := $(call append-path,$(staging),$(addon_dir_img))/images/$(TARGET_CPU_ABI) -$(full_target_img): $(full_target) $(addon_img_source_prop) | $(ACP) $(SOONG_ZIP) +$(full_target_img): $(full_target) $(addon_img_source_prop) | $(SOONG_ZIP) @echo Packaging SDK Addon System-Image: $@ $(hide) mkdir -p $(dir $@) - $(ACP) -r $(PRODUCT_OUT)/data $(PRIVATE_STAGING_DIR)/data + cp -R $(PRODUCT_OUT)/data $(PRIVATE_STAGING_DIR)/data $(hide) $(SOONG_ZIP) -o $@ -C $(dir $(PRIVATE_STAGING_DIR)) -D $(PRIVATE_STAGING_DIR) diff --git a/core/tasks/tools/compatibility.mk b/core/tasks/tools/compatibility.mk index 57a5cf945e..f4803001ff 100644 --- a/core/tasks/tools/compatibility.mk +++ b/core/tasks/tools/compatibility.mk @@ -53,8 +53,8 @@ $(compatibility_zip): $(test_artifacts) $(test_tools) $(test_suite_prebuilt_tool $(hide) mkdir -p $(PRIVATE_OUT_DIR)/tools $(PRIVATE_OUT_DIR)/testcases $(hide) echo $(BUILD_NUMBER_FROM_FILE) > $(PRIVATE_OUT_DIR)/tools/version.txt # Copy tools - $(hide) $(ACP) -fp $(PRIVATE_TOOLS) $(PRIVATE_OUT_DIR)/tools - $(if $(PRIVATE_DYNAMIC_CONFIG),$(hide) $(ACP) -fp $(PRIVATE_DYNAMIC_CONFIG) $(PRIVATE_OUT_DIR)/testcases/$(PRIVATE_SUITE_NAME).dynamic) + $(hide) cp $(PRIVATE_TOOLS) $(PRIVATE_OUT_DIR)/tools + $(if $(PRIVATE_DYNAMIC_CONFIG),$(hide) cp $(PRIVATE_DYNAMIC_CONFIG) $(PRIVATE_OUT_DIR)/testcases/$(PRIVATE_SUITE_NAME).dynamic) $(hide) find $(dir $@)/$(PRIVATE_NAME) | sort >$@.list $(hide) $(SOONG_ZIP) -d -o $@ -C $(dir $@) -l $@.list diff --git a/target/product/gsi/Android.mk b/target/product/gsi/Android.mk index eaaa0512f0..56932342cc 100644 --- a/target/product/gsi/Android.mk +++ b/target/product/gsi/Android.mk @@ -46,6 +46,8 @@ else ifeq ($(TARGET_BUILD_PDK),true) # b/118634643: don't check VNDK lib list when building PDK. Some libs (libandroid_net.so # and some render-script related ones) can't be built in PDK due to missing frameworks/base. check-vndk-list: ; +else ifeq ($(TARGET_SKIP_CURRENT_VNDK),true) +check-vndk-list: ; else check-vndk-list: $(check-vndk-list-timestamp) endif @@ -100,11 +102,11 @@ ifneq ($(BOARD_VNDK_VERSION),) include $(CLEAR_VARS) LOCAL_MODULE := vndk_package LOCAL_REQUIRED_MODULES := \ - $(LLNDK_LIBRARIES) \ - llndk.libraries.txt \ - vndksp.libraries.txt + $(LLNDK_LIBRARIES) ifneq ($(TARGET_SKIP_CURRENT_VNDK),true) LOCAL_REQUIRED_MODULES += \ + llndk.libraries.txt \ + vndksp.libraries.txt \ $(addsuffix .vendor,$(VNDK_CORE_LIBRARIES)) \ $(addsuffix .vendor,$(VNDK_SAMEPROCESS_LIBRARIES)) endif |