diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-04-07 00:07:33 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2020-04-07 00:07:33 +0000 |
| commit | 560c50f6cd4c2080756fce7e664527269394233d (patch) | |
| tree | 5a3f4740fff375a6a266b1d4759b8e35adeef8af | |
| parent | a39685735c20631f18f29653b0191b75cf9377aa (diff) | |
| parent | e983485270001efd7e42a49785ae073dc0373822 (diff) | |
| download | hikey-560c50f6cd4c2080756fce7e664527269394233d.tar.gz | |
Merge "Remove old vndk logic"
| -rw-r--r-- | device-common.mk | 32 | ||||
| -rw-r--r-- | vndk/Android.mk | 28 |
2 files changed, 0 insertions, 60 deletions
diff --git a/device-common.mk b/device-common.mk index 5d38628d..9013f032 100644 --- a/device-common.mk +++ b/device-common.mk @@ -247,38 +247,6 @@ PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \ device/linaro/hikey/init.common.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.common.rc \ -PRODUCT_PACKAGES += \ - android.hardware.renderscript@1.0.vndk-sp\ - android.hardware.graphics.composer@2.1.vndk-sp\ - android.hardware.graphics.allocator@2.0.vndk-sp\ - android.hardware.graphics.mapper@2.0.vndk-sp\ - android.hardware.graphics.common@1.0.vndk-sp\ - libvndksupport.vndk-sp\ - libbinder.vndk-sp\ - libhwbinder.vndk-sp\ - libbase.vndk-sp\ - libfmq.vndk-sp\ - libcutils.vndk-sp\ - libhardware.vndk-sp\ - libhidlbase.vndk-sp\ - libhidltransport.vndk-sp\ - libui.vndk-sp\ - libutils.vndk-sp\ - libc++.vndk-sp\ - libRS_internal.vndk-sp\ - libRSDriver.vndk-sp\ - libRSCpuRef.vndk-sp\ - libbcinfo.vndk-sp\ - libblas.vndk-sp\ - libft2.vndk-sp\ - libpng.vndk-sp\ - libcompiler_rt.vndk-sp\ - libbacktrace.vndk-sp\ - libunwind.vndk-sp\ - libunwindstack.vndk-sp\ - liblzma.vndk-sp\ - libion.vndk-sp\ - # Health PRODUCT_PACKAGES += \ android.hardware.health@2.0-service \ diff --git a/vndk/Android.mk b/vndk/Android.mk deleted file mode 100644 index b6a4f74d..00000000 --- a/vndk/Android.mk +++ /dev/null @@ -1,28 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -define add-vndk-sp-lib -include $$(CLEAR_VARS) -LOCAL_MODULE := $1.vndk-sp -LOCAL_MODULE_CLASS := SHARED_LIBRARIES -LOCAL_PREBUILT_MODULE_FILE := $$(TARGET_OUT)/lib/$1.so -LOCAL_MULTILIB := 32 -LOCAL_MODULE_TAGS := optional -LOCAL_INSTALLED_MODULE_STEM := $1.so -LOCAL_MODULE_SUFFIX := .so -LOCAL_MODULE_RELATIVE_PATH := vndk-sp -include $$(BUILD_PREBUILT) - -include $$(CLEAR_VARS) -LOCAL_MODULE := $1.vndk-sp -LOCAL_MODULE_CLASS := SHARED_LIBRARIES -LOCAL_PREBUILT_MODULE_FILE := $$(TARGET_OUT)/lib64/$1.so -LOCAL_MULTILIB := 64 -LOCAL_MODULE_TAGS := optional -LOCAL_INSTALLED_MODULE_STEM := $1.so -LOCAL_MODULE_SUFFIX := .so -LOCAL_MODULE_RELATIVE_PATH := vndk-sp -include $$(BUILD_PREBUILT) -endef - -$(foreach lib,$(VNDK_SP_LIBRARIES),\ - $(eval $(call add-vndk-sp-lib,$(lib)))) |