diff options
| author | Winson Chiu <chiuwinson@google.com> | 2019-10-23 21:24:40 +0000 |
|---|---|---|
| committer | Winson Chiu <chiuwinson@google.com> | 2019-10-23 21:24:40 +0000 |
| commit | 3d5eba2be41979fd7ada0623dc8e0e584e0dc070 (patch) | |
| tree | 81309e6c77a1f684c563ea6e160fc7061adbb986 | |
| parent | b808592783a2213c3c9c02cd9c9d039a6ce99f46 (diff) | |
| download | build-3d5eba2be41979fd7ada0623dc8e0e584e0dc070.tar.gz | |
Revert "VNDK library list uses installed name"
This reverts commit b808592783a2213c3c9c02cd9c9d039a6ce99f46.
Reason for revert: potentially broke build b/143233626
Change-Id: I1458cb687923833010f3de1277092f8ead744ea3
| -rw-r--r-- | target/product/gsi/Android.mk | 34 | ||||
| -rw-r--r-- | target/product/gsi/current.txt | 4 |
2 files changed, 10 insertions, 28 deletions
diff --git a/target/product/gsi/Android.mk b/target/product/gsi/Android.mk index b6729bb429..2b288e6b24 100644 --- a/target/product/gsi/Android.mk +++ b/target/product/gsi/Android.mk @@ -2,37 +2,19 @@ LOCAL_PATH:= $(call my-dir) ##################################################################### # Create the list of vndk libraries from the source code. - -# Returns the unique installed basenames of a module, or module.so if there are -# none. The guess is to handle cases like libc, where the module itself is -# marked uninstallable but a symlink is installed with the name libc.so. -# $(1): list of libraries -# $(2): suffix to to add to each library (not used for guess) -define module-installed-files-or-guess -$(foreach lib,$(1),$(or $(strip $(sort $(notdir $(call module-installed-files,$(lib)$(2))))),$(lib).so)) -endef - INTERNAL_VNDK_LIB_LIST := $(call intermediates-dir-for,PACKAGING,vndk)/libs.txt -$(INTERNAL_VNDK_LIB_LIST): PRIVATE_LLNDK_LIBRARIES := \ - $(call module-installed-files-or-guess,$(filter-out libclang_rt.%,$(LLNDK_LIBRARIES)),) -$(INTERNAL_VNDK_LIB_LIST): PRIVATE_VNDK_SAMEPROCESS_LIBRARIES := \ - $(call module-installed-files-or-guess,$(VNDK_SAMEPROCESS_LIBRARIES),.vendor) -$(INTERNAL_VNDK_LIB_LIST): PRIVATE_VNDK_CORE_LIBRARIES := \ - $(call module-installed-files-or-guess,$(filter-out libclang_rt.%,$(VNDK_CORE_LIBRARIES)),.vendor) -$(INTERNAL_VNDK_LIB_LIST): PRIVATE_VNDK_PRIVATE_LIBRARIES := \ - $(call module-installed-files-or-guess,$(VNDK_PRIVATE_LIBRARIES),.vendor) $(INTERNAL_VNDK_LIB_LIST): @echo "Generate: $@" @mkdir -p $(dir $@) $(hide) echo -n > $@ - $(hide) $(foreach lib, $(PRIVATE_LLNDK_LIBRARIES), \ - echo LLNDK: $(lib) >> $@;) - $(hide) $(foreach lib, $(PRIVATE_VNDK_SAMEPROCESS_LIBRARIES), \ - echo VNDK-SP: $(lib) >> $@;) - $(hide) $(foreach lib, $(PRIVATE_VNDK_CORE_LIBRARIES), \ - echo VNDK-core: $(lib) >> $@;) - $(hide) $(foreach lib, $(PRIVATE_VNDK_PRIVATE_LIBRARIES), \ - echo VNDK-private: $(lib) >> $@;) + $(hide) $(foreach lib, $(filter-out libclang_rt.%,$(LLNDK_LIBRARIES)), \ + echo LLNDK: $(lib).so >> $@;) + $(hide) $(foreach lib, $(VNDK_SAMEPROCESS_LIBRARIES), \ + echo VNDK-SP: $(lib).so >> $@;) + $(hide) $(foreach lib, $(filter-out libclang_rt.%,$(VNDK_CORE_LIBRARIES)), \ + echo VNDK-core: $(lib).so >> $@;) + $(hide) $(foreach lib, $(VNDK_PRIVATE_LIBRARIES), \ + echo VNDK-private: $(lib).so >> $@;) ##################################################################### # This is the up-to-date list of vndk libs. diff --git a/target/product/gsi/current.txt b/target/product/gsi/current.txt index 99d0f10018..6649f28fb3 100644 --- a/target/product/gsi/current.txt +++ b/target/product/gsi/current.txt @@ -239,8 +239,8 @@ VNDK-core: libpiex.so VNDK-core: libpng.so VNDK-core: libpower.so VNDK-core: libprocinfo.so -VNDK-core: libprotobuf-cpp-full-3.9.1.so -VNDK-core: libprotobuf-cpp-lite-3.9.1.so +VNDK-core: libprotobuf-cpp-full.so +VNDK-core: libprotobuf-cpp-lite.so VNDK-core: libpuresoftkeymasterdevice.so VNDK-core: libradio_metadata.so VNDK-core: libselinux.so |