Commit f4cf1eb6 authored Apr 07, 2020 by Colin Cross Committed by Automerger Merge Worker Apr 07, 2020

Merge "Revert "Fix static dependency on libprotobuf-cpp-lite-ndk"" am:...

Merge "Revert "Fix static dependency on libprotobuf-cpp-lite-ndk"" am: 32c3f23f am: d7c84979 am: 52a0f7c4

Change-Id: I2a65161fec95fa66760d8f5675003bffcce9a6aa

parents 0e00f1ec 52a0f7c4

apex/sdkextensions/derive_sdk/Android.bp

+1 −1

Original line number	Diff line number	Diff line
		@@ -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",
		],
		}