From 3a6ecdcdaa8c8097d5cc539e0dd98906411e85cc Mon Sep 17 00:00:00 2001 From: Jiyong Park Date: Tue, 21 Nov 2017 10:34:30 +0900 Subject: [PATCH] DO NOT MERGE: android.hardware.graphics.allocator@2.0 is no longer VNDK-SP The interface lib has been in VNDK-SP because android.hardware.graphics.mapper@1.0 was using it. However, since the dependency has gone [1], there is no need keep it in VNDK-SP. The VNDK-SP set should be kept as small as possible because libs in VNDK-SP are subject to double-loading. Unmark the 'support_system_process' property to exclude the lib from VNDK-SP. Bug: 69480083 Test: walleye boots to the UI Merged-In: I8722c1ac15ddf56a627a12a0c649b4d734e5e5cd Change-Id: I8722c1ac15ddf56a627a12a0c649b4d734e5e5cd (cherry picked from commit ec44d18dbe693e86db9ac6e56ab08e415664be56) --- CleanSpec.mk | 1 + graphics/allocator/2.0/Android.bp | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/CleanSpec.mk b/CleanSpec.mk index 42399a6664..cad545c0e3 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -56,3 +56,4 @@ $(call add-clean-step, rm -rf $(OUT_DIR)/soong/.intermediates/) $(call add-clean-step, rm -rf $(OUT_DIR)/soong/.intermediates/hardware/interfaces/) $(call add-clean-step, rm -rf $(OUT_DIR)/soong/.intermediates/hardware/interfaces/) $(call add-clean-step, find $(PRODUCT_OUT)/system $(PRODUCT_OUT)/vendor -type f -name "android\.hardware\.configstore*" -print0 | xargs -0 rm -f) +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/vndk-sp/android.hardware.graphics.allocator*) diff --git a/graphics/allocator/2.0/Android.bp b/graphics/allocator/2.0/Android.bp index 0b0722e249..50b474e00c 100644 --- a/graphics/allocator/2.0/Android.bp +++ b/graphics/allocator/2.0/Android.bp @@ -5,7 +5,6 @@ hidl_interface { root: "android.hardware", vndk: { enabled: true, - support_system_process: true, }, srcs: [ "IAllocator.hal",