diff options
Diffstat (limited to 'aconfig/init.go')
| -rw-r--r-- | aconfig/init.go | 22 |
1 files changed, 19 insertions, 3 deletions
diff --git a/aconfig/init.go b/aconfig/init.go index 634612d63..37167aa5d 100644 --- a/aconfig/init.go +++ b/aconfig/init.go @@ -30,7 +30,7 @@ var ( ` ${declarations}` + ` ${values}` + ` --cache ${out}.tmp` + - ` && ( if cmp -s ${out}.tmp ; then rm ${out}.tmp ; else mv ${out}.tmp ${out} ; fi )`, + ` && ( if cmp -s ${out}.tmp ${out} ; then rm ${out}.tmp ; else mv ${out}.tmp ${out} ; fi )`, // ` --build-id ${release_version}` + CommandDeps: []string{ "${aconfig}", @@ -39,11 +39,12 @@ var ( }, "release_version", "package", "declarations", "values") // For java_aconfig_library: Generate java file - srcJarRule = pctx.AndroidStaticRule("aconfig_srcjar", + javaRule = pctx.AndroidStaticRule("java_aconfig_library", blueprint.RuleParams{ Command: `rm -rf ${out}.tmp` + ` && mkdir -p ${out}.tmp` + ` && ${aconfig} create-java-lib` + + ` --mode ${mode}` + ` --cache ${in}` + ` --out ${out}.tmp` + ` && $soong_zip -write_if_changed -jar -o ${out} -C ${out}.tmp -D ${out}.tmp` + @@ -53,7 +54,21 @@ var ( "$soong_zip", }, Restat: true, - }) + }, "mode") + + // For java_aconfig_library: Generate java file + cppRule = pctx.AndroidStaticRule("cc_aconfig_library", + blueprint.RuleParams{ + Command: `rm -rf ${gendir}` + + ` && mkdir -p ${gendir}` + + ` && ${aconfig} create-cpp-lib` + + ` --cache ${in}` + + ` --out ${gendir}`, + CommandDeps: []string{ + "$aconfig", + "$soong_zip", + }, + }, "gendir") // For all_aconfig_declarations allDeclarationsRule = pctx.AndroidStaticRule("all_aconfig_declarations_dump", @@ -75,6 +90,7 @@ func registerBuildComponents(ctx android.RegistrationContext) { ctx.RegisterModuleType("aconfig_declarations", DeclarationsFactory) ctx.RegisterModuleType("aconfig_values", ValuesFactory) ctx.RegisterModuleType("aconfig_value_set", ValueSetFactory) + ctx.RegisterModuleType("cc_aconfig_library", CcAconfigLibraryFactory) ctx.RegisterModuleType("java_aconfig_library", JavaDeclarationsLibraryFactory) ctx.RegisterParallelSingletonType("all_aconfig_declarations", AllAconfigDeclarationsFactory) } |