Merge "Add a nano proto version of aconfig protos" into main am: 4a2c1b5ca3
Original change: https://android-review.googlesource.com/c/platform/build/+/3087843 Change-Id: I7db20f5df1acf2f5e31d8f36ce854f2a7db7a0a9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
commit
fd1ca8b6ff
2 changed files with 18 additions and 2 deletions
|
@ -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 {
|
||||
|
|
1
tools/aconfig/aconfig_protos/jarjar-nano-rules.txt
Normal file
1
tools/aconfig/aconfig_protos/jarjar-nano-rules.txt
Normal file
|
@ -0,0 +1 @@
|
|||
rule com.google.protobuf.** android.internal.framework.protobuf.@1
|
Loading…
Reference in a new issue