Commit 326dca22 authored Apr 08, 2020 by Colin Cross Committed by Automerger Merge Worker Apr 08, 2020

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

Merge "Revert^2 "Fix static dependency on libprotobuf-cpp-lite-ndk"" am: 9f95dad1 am: c7b6e83a am: 5c924573 am: 49b1db6b

Change-Id: I1f216440d0f412dc21643d2171bd04ccb9958304

parents 24188516 49b1db6b

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",
		],
		}