diff options
| author | Xin Li <delphij@google.com> | 2020-08-27 10:16:27 -0700 |
|---|---|---|
| committer | Xin Li <delphij@google.com> | 2020-08-27 10:16:27 -0700 |
| commit | 5cf51c59c86b4fd108b4d543c6e2de1a494dc8ca (patch) | |
| tree | 430bd2b21fde776db4d2a0e9c554077f06d319af | |
| parent | 85fb570c156936f86f06368fcd754c18fa14d151 (diff) | |
| parent | 7381f818badaad1c5944901f8af2bad93f840f74 (diff) | |
| download | libchrome-temp_sam_168057903.tar.gz | |
Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)temp_sam_168057903
Bug: 166295507
Merged-In: I008744c30f7e6b8fb8771fe88ff9105ede5bc444
Change-Id: Ia1df46118f3467b12bd0fcb06dbb32772d95720b
| -rw-r--r-- | Android.bp | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/Android.bp b/Android.bp index f40bc87786..95bec2ca23 100644 --- a/Android.bp +++ b/Android.bp @@ -1233,14 +1233,28 @@ genrule { out: ["common_custom_types__type_mappings"], } +python_binary_host { + name: "mojom_types_downgrader", + main: "mojo/public/tools/bindings/mojom_types_downgrader.py", + srcs: [ + "mojo/public/tools/bindings/mojom_types_downgrader.py", + ], + defaults: ["libmojo_scripts"], +} + +generate_mojom_downgraded_files { + name: "libmojo_mojom_downgraded_files", + srcs: [":libmojo_mojom_files"], +} + generate_mojom_pickles { name: "libmojo_mojom_pickles", - srcs: [":libmojo_mojom_files"], + srcs: [":libmojo_mojom_downgraded_files"], } generate_mojom_headers { name: "libmojo_mojom_headers", - srcs: [":libmojo_mojom_files"], + srcs: [":libmojo_mojom_downgraded_files"], pickles: [":libmojo_mojom_pickles"], templates: ":libmojo_mojom_templates", flags: "--disallow_native_types", @@ -1249,7 +1263,7 @@ generate_mojom_headers { generate_mojom_srcs { name: "libmojo_mojom_srcs", - srcs: [":libmojo_mojom_files"], + srcs: [":libmojo_mojom_downgraded_files"], pickles: [":libmojo_mojom_pickles"], templates: ":libmojo_mojom_templates", flags: "--disallow_native_types", @@ -1392,7 +1406,7 @@ cc_library_shared { generate_mojom_srcjar { name: "libmojo_mojom_java_srcs", - srcs: [":libmojo_mojom_files"], + srcs: [":libmojo_mojom_downgraded_files"], pickles: [":libmojo_mojom_pickles"], srcjar: "libmojo_mojom.srcjar", templates: ":libmojo_mojom_templates", |