StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes Ia106d48e,Ib6c0e778

Browse Source 
am: 63f4b57a7f

Change-Id: I65b761fd319f820b9d02f2a652fa2d844c353cd4
This commit is contained in:
Colin Cross
2019-07-16 14:59:09 -07:00
committed by android-build-merger
parent 1866802e07 63f4b57a7f
commit 723cc24f2e
3 changed files with 22 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
java/java.go
View File

@@ -2040,7 +2040,7 @@ func ImportFactoryHost() android.Module {
// dex_import module
type DexImportProperties struct {
Jars []string
Jars []string `android:"path"`
}
type DexImport struct {
@@ -2068,10 +2068,6 @@ func (j *DexImport) Name() string {
return j.prebuilt.Name(j.ModuleBase.Name())
}
func (j *DexImport) DepsMutator(ctx android.BottomUpMutatorContext) {
android.ExtractSourcesDeps(ctx, j.properties.Jars)
}
func (j *DexImport) GenerateAndroidBuildActions(ctx android.ModuleContext) {
if len(j.properties.Jars) != 1 {
ctx.PropertyErrorf("jars", "exactly one jar must be provided")