From 5529e36e88f8320d1f7fcab533ec3dd668b92c27 Mon Sep 17 00:00:00 2001 From: Mark Punzalan Date: Wed, 15 May 2024 06:12:49 +0000 Subject: [PATCH] Add a nano proto version of aconfig protos Framework already has nano protos, and reusing them won't introduce extra dependencies for the apps This is setting up the resources flagging in the framework Bug: 297373084 Test: Built with related changes Change-Id: I518bd56f56c42e0adef0002e95f8948e0904fb43 --- tools/aconfig/aconfig_protos/Android.bp | 19 +++++++++++++++++-- .../aconfig_protos/jarjar-nano-rules.txt | 1 + 2 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 tools/aconfig/aconfig_protos/jarjar-nano-rules.txt diff --git a/tools/aconfig/aconfig_protos/Android.bp b/tools/aconfig/aconfig_protos/Android.bp index 18c545ae96..d24199443c 100644 --- a/tools/aconfig/aconfig_protos/Android.bp +++ b/tools/aconfig/aconfig_protos/Android.bp @@ -17,7 +17,22 @@ java_library { apex_available: [ "com.android.configinfrastructure", "//apex_available:platform", - ] + ], +} + +java_library { + name: "libaconfig_java_proto_nano", + srcs: ["protos/aconfig.proto"], + static_libs: ["libprotobuf-java-nano"], + proto: { + type: "nano", + }, + sdk_version: "current", + min_sdk_version: "UpsideDownCake", + apex_available: [ + "//apex_available:platform", + ], + jarjar_rules: "jarjar-nano-rules.txt", } java_library_host { @@ -58,7 +73,7 @@ rust_defaults { ], proc_macros: [ "libpaste", - ] + ], } rust_library { diff --git a/tools/aconfig/aconfig_protos/jarjar-nano-rules.txt b/tools/aconfig/aconfig_protos/jarjar-nano-rules.txt new file mode 100644 index 0000000000..b58fa64838 --- /dev/null +++ b/tools/aconfig/aconfig_protos/jarjar-nano-rules.txt @@ -0,0 +1 @@ +rule com.google.protobuf.** android.internal.framework.protobuf.@1 \ No newline at end of file