diff options
Diffstat (limited to 'Ravenwood.bp')
| -rw-r--r-- | Ravenwood.bp | 37 |
1 files changed, 22 insertions, 15 deletions
diff --git a/Ravenwood.bp b/Ravenwood.bp index 912f19d4ca3c..87f11242bfbb 100644 --- a/Ravenwood.bp +++ b/Ravenwood.bp @@ -34,11 +34,12 @@ java_genrule { "--debug-log $(location hoststubgen_framework-minus-apex.log) " + "--stats-file $(location hoststubgen_framework-minus-apex_stats.csv) " + + "--supported-api-list-file $(location hoststubgen_framework-minus-apex_apis.csv) " + "--out-impl-jar $(location ravenwood.jar) " + - "--gen-keep-all-file $(location hoststubgen_keep_all.txt) " + - "--gen-input-dump-file $(location hoststubgen_dump.txt) " + + "--gen-keep-all-file $(location hoststubgen_framework-minus-apex_keep_all.txt) " + + "--gen-input-dump-file $(location hoststubgen_framework-minus-apex_dump.txt) " + "--in-jar $(location :framework-minus-apex-for-hoststubgen) " + "--policy-override-file $(location :ravenwood-framework-policies) " + @@ -53,13 +54,14 @@ java_genrule { "ravenwood.jar", // Following files are created just as FYI. - "hoststubgen_keep_all.txt", - "hoststubgen_dump.txt", + "hoststubgen_framework-minus-apex_keep_all.txt", + "hoststubgen_framework-minus-apex_dump.txt", "hoststubgen_framework-minus-apex.log", "hoststubgen_framework-minus-apex_stats.csv", + "hoststubgen_framework-minus-apex_apis.csv", ], - visibility: ["//visibility:private"], + defaults: ["ravenwood-internal-only-visibility-genrule"], } // Extract the impl jar from "framework-minus-apex.ravenwood-base" for subsequent build rules. @@ -95,11 +97,12 @@ java_genrule { "--debug-log $(location hoststubgen_services.core.log) " + "--stats-file $(location hoststubgen_services.core_stats.csv) " + + "--supported-api-list-file $(location hoststubgen_services.core_apis.csv) " + "--out-impl-jar $(location ravenwood.jar) " + - "--gen-keep-all-file $(location hoststubgen_keep_all.txt) " + - "--gen-input-dump-file $(location hoststubgen_dump.txt) " + + "--gen-keep-all-file $(location hoststubgen_services.core_keep_all.txt) " + + "--gen-input-dump-file $(location hoststubgen_services.core_dump.txt) " + "--in-jar $(location :services.core-for-hoststubgen) " + "--policy-override-file $(location :ravenwood-services-policies) " + @@ -114,13 +117,14 @@ java_genrule { "ravenwood.jar", // Following files are created just as FYI. - "hoststubgen_keep_all.txt", - "hoststubgen_dump.txt", + "hoststubgen_services.core_keep_all.txt", + "hoststubgen_services.core_dump.txt", "hoststubgen_services.core.log", "hoststubgen_services.core_stats.csv", + "hoststubgen_services.core_apis.csv", ], - visibility: ["//visibility:private"], + defaults: ["ravenwood-internal-only-visibility-genrule"], } java_genrule { @@ -147,12 +151,15 @@ java_library { // Jars in "ravenwood-runtime" are set to the classpath, sorted alphabetically. // Rename some of the dependencies to make sure they're included in the intended order. -java_genrule { +// Also apply jarjar. +java_library { name: "100-framework-minus-apex.ravenwood", - defaults: ["ravenwood-internal-only-visibility-genrule"], - cmd: "cp $(in) $(out)", - srcs: [":framework-minus-apex.ravenwood"], - out: ["100-framework-minus-apex.ravenwood.jar"], + defaults: ["ravenwood-internal-only-visibility-java"], + static_libs: [ + "framework-minus-apex.ravenwood", + ], + sdk_version: "core_platform", + jarjar_rules: ":ravenwood-framework-jarjar-rules", } java_genrule { |