summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Liz Kammer <eakammer@google.com> 2022-03-22 13:39:40 -0400
committer Liz Kammer <eakammer@google.com> 2022-03-28 21:40:53 +0000
commitba0a32c30303d61902509252c543c64a6f97c5f9 (patch)
tree76a7161eed22aece78471ed48ca5bdba462cbc6a
parent2f173adb9332854682f005424e02f6b43eb8d969 (diff)
Change aapt2 to specify full protos
Soong's cc support for protos is inconsistent, it adds a dependency on lite proto library is proto.type is unspecified, but builds as full. Update aapt2 to explicitly build full protos rather than rely on Soong's inconsistent defaulting of proto.type Test: CI Change-Id: I5600d04c7ac32a04fd2b230912e02280a3874812
-rw-r--r--tools/aapt2/Android.bp1
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/aapt2/Android.bp b/tools/aapt2/Android.bp
index 740b44e0ce28..50cd455c5480 100644
--- a/tools/aapt2/Android.bp
+++ b/tools/aapt2/Android.bp
@@ -165,6 +165,7 @@ cc_library_host_static {
],
proto: {
export_proto_headers: true,
+ type: "full",
},
defaults: ["aapt2_defaults"],
}