From 0d485b050ccd8af68e73b43bae34f266e0cb7685 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Tue, 7 Apr 2020 04:21:21 +0000 Subject: [PATCH] Revert "Fix static dependency on libprotobuf-cpp-lite-ndk" Revert "Use stl to depend on libc++" Revert "Use libnativewindow for platform variant of libRSSupport" Revert "Use libnativewindow for platform variant of android_nati..." Revert "Set sdk_version for cc_genrules used by modules with sdk..." Revert "Use sdk variant of Soong modules when LOCAL_SDK_VERSION ..." Revert "Add sdk mutator for native modules" Revert submission 1242911-sdk_version_variant Reason for revert: b/153394225 Reverted Changes: Ife99745fb:Use libnativewindow for platform variant of libagq... I1bae84c43:Use libnativewindow for platform variant of androi... I6e6021ed3:Use stl to depend on libc++ Ife99745fb:Use libnativewindow for platform variant of libRSS... I2c9f439b9:Fix static dependency on libprotobuf-cpp-lite-ndk Iff2aff9cf:Set sdk_version for cc_genrules used by modules wi... I7d72934aa:Add sdk mutator for native modules Ief378a007:Use sdk variant of Soong modules when LOCAL_SDK_VE... Bug: 149591340 Change-Id: Iff337b01c8471068fac0645109cd8617a0f55527 Fixes: 153394225 --- apex/sdkextensions/derive_sdk/Android.bp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apex/sdkextensions/derive_sdk/Android.bp b/apex/sdkextensions/derive_sdk/Android.bp index 6e21581f94ee5..cf49902d9978d 100644 --- a/apex/sdkextensions/derive_sdk/Android.bp +++ b/apex/sdkextensions/derive_sdk/Android.bp @@ -20,13 +20,13 @@ cc_defaults { ], proto: { type: "lite", - static: true, }, sdk_version: "current", stl: "c++_static", shared_libs: [ "liblog" ], static_libs: [ "libbase_ndk", + "libprotobuf-cpp-lite-ndk", ], }