From 5d5bcb829ac5b5dd7bf11733ce48acc27567dca6 Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Tue, 7 Apr 2020 16:50:32 +0000
Subject: [PATCH] Revert^2 "Fix static dependency on libprotobuf-cpp-lite-ndk"

0d485b050ccd8af68e73b43bae34f266e0cb7685

Change-Id: Ica45851c95ca2be1bec7c48f34e4584fe884ce2c
---
 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 cf49902d9978d..6e21581f94ee5 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",
     ],
 }