device/generic/common
| Revision | 34b763b707ff421ffba3528098d80778c9a81b57 (tree) |
|---|---|
| Time | 2017-06-08 18:56:51 |
| Author | Bartosz Fabianowski <bartfab@goog...> |
| Commiter | android-build-merger |
Revert "New target to add vndk-sp libs to system image" am: f4e3d9d712 am: b9ea723e19
am: 5b2759ccda
Change-Id: I8ed1a8d1940a5f1776ee94f5f6fd4d5ebeeac728
vndk/Android.mk vndk/vndk-sp-libs.mk| @@ -1,47 +0,0 @@ | ||
| 1 | -ifneq ($(filter generic_%,$(TARGET_DEVICE)),) | |
| 2 | - | |
| 3 | -LOCAL_PATH := $(call my-dir) | |
| 4 | - | |
| 5 | -include $(LOCAL_PATH)/vndk-sp-libs.mk | |
| 6 | - | |
| 7 | -define define-vndk-sp-lib | |
| 8 | -include $$(CLEAR_VARS) | |
| 9 | -LOCAL_MODULE := $1.vndk-sp-gen | |
| 10 | -LOCAL_MODULE_CLASS := SHARED_LIBRARIES | |
| 11 | -LOCAL_PREBUILT_MODULE_FILE := $$(TARGET_OUT_INTERMEDIATE_LIBRARIES)/$1.so | |
| 12 | -LOCAL_STRIP_MODULE := false | |
| 13 | -LOCAL_MULTILIB := first | |
| 14 | -LOCAL_MODULE_TAGS := optional | |
| 15 | -LOCAL_INSTALLED_MODULE_STEM := $1.so | |
| 16 | -LOCAL_MODULE_SUFFIX := .so | |
| 17 | -LOCAL_MODULE_RELATIVE_PATH := vndk-sp | |
| 18 | -include $$(BUILD_PREBUILT) | |
| 19 | - | |
| 20 | -ifneq ($$(TARGET_2ND_ARCH),) | |
| 21 | -ifneq ($$(TARGET_TRANSLATE_2ND_ARCH),true) | |
| 22 | -include $$(CLEAR_VARS) | |
| 23 | -LOCAL_MODULE := $1.vndk-sp-gen | |
| 24 | -LOCAL_MODULE_CLASS := SHARED_LIBRARIES | |
| 25 | -LOCAL_PREBUILT_MODULE_FILE := $$($$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_INTERMEDIATE_LIBRARIES)/$1.so | |
| 26 | -LOCAL_STRIP_MODULE := false | |
| 27 | -LOCAL_MULTILIB := 32 | |
| 28 | -LOCAL_MODULE_TAGS := optional | |
| 29 | -LOCAL_INSTALLED_MODULE_STEM := $1.so | |
| 30 | -LOCAL_MODULE_SUFFIX := .so | |
| 31 | -LOCAL_MODULE_RELATIVE_PATH := vndk-sp | |
| 32 | -include $$(BUILD_PREBUILT) | |
| 33 | -endif # TARGET_TRANSLATE_2ND_ARCH is not true | |
| 34 | -endif # TARGET_2ND_ARCH is not empty | |
| 35 | -endef | |
| 36 | - | |
| 37 | -$(foreach lib,$(VNDK_SP_LIBRARIES),\ | |
| 38 | - $(eval $(call define-vndk-sp-lib,$(lib)))) | |
| 39 | - | |
| 40 | -include $(CLEAR_VARS) | |
| 41 | -LOCAL_MODULE := vndk-sp | |
| 42 | -LOCAL_MODULE_OWNER := google | |
| 43 | -LOCAL_MODULE_TAGS := optional | |
| 44 | -LOCAL_REQUIRED_MODULES := $(addsuffix .vndk-sp-gen,$(VNDK_SP_LIBRARIES)) | |
| 45 | -include $(BUILD_PHONY_PACKAGE) | |
| 46 | - | |
| 47 | -endif # TARGET_DEVICE is generic_* |
| @@ -1,26 +0,0 @@ | ||
| 1 | -VNDK_SP_LIBRARIES := \ | |
| 2 | - android.hardware.graphics.allocator@2.0 \ | |
| 3 | - android.hardware.graphics.mapper@2.0 \ | |
| 4 | - android.hardware.graphics.common@1.0 \ | |
| 5 | - android.hardware.renderscript@1.0 \ | |
| 6 | - android.hidl.base@1.0 \ | |
| 7 | - libRSCpuRef \ | |
| 8 | - libRSDriver \ | |
| 9 | - libRS_internal \ | |
| 10 | - libbacktrace \ | |
| 11 | - libbase \ | |
| 12 | - libbcinfo \ | |
| 13 | - libblas \ | |
| 14 | - libc++ \ | |
| 15 | - libcompiler_rt \ | |
| 16 | - libcutils \ | |
| 17 | - libft2 \ | |
| 18 | - libhardware \ | |
| 19 | - libhidlbase \ | |
| 20 | - libhidltransport \ | |
| 21 | - libhwbinder \ | |
| 22 | - libion \ | |
| 23 | - liblzma \ | |
| 24 | - libpng \ | |
| 25 | - libunwind \ | |
| 26 | - libutils \ |
Fork