Remove sdk.proto copy in derive_sdk dir
Make a separate dir for proto files and define libraries there.
Also remove some unnecessary options:
- Two were java-specific, and this proto is only used in cpp code
- The package name is not necessary as this proto is internal to this
module.
Bug: 173188089
Test: presubmit
Change-Id: I1bfd29741898832e776aaf45ccf17eed598be267
diff --git a/derive_sdk/Android.bp b/derive_sdk/Android.bp
index dc4e352..ca80b9b 100644
--- a/derive_sdk/Android.bp
+++ b/derive_sdk/Android.bp
@@ -14,10 +14,6 @@
cc_defaults {
name: "derive_sdk-defaults",
- proto: {
- type: "lite",
- static: true,
- },
min_sdk_version: "30",
shared_libs: ["liblog"],
// static c++/libbase for smaller size
@@ -26,15 +22,13 @@
"libbase",
"libmodules-utils-build",
"libprotobuf-cpp-lite",
+ "libsdk_proto"
],
}
cc_library {
name: "libderive_sdk",
- srcs: [
- "derive_sdk.cpp",
- "sdk.proto",
- ],
+ srcs: ["derive_sdk.cpp"],
defaults: ["derive_sdk-defaults"],
apex_available: ["com.android.sdkext"],
}
@@ -66,10 +60,7 @@
cc_test {
name: "derive_sdk_test",
defaults: ["derive_sdk-defaults"],
- srcs: [
- "derive_sdk_test.cpp",
- "sdk.proto",
- ],
+ srcs: ["derive_sdk_test.cpp"],
require_root: true,
static_libs: ["libderive_sdk"],
test_suites: ["device-tests"],