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

Merge "Fix android_app_set documentation" am: 99e4fba932

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1324841

Change-Id: I35634c8ed1290b5848fb4a5a8278b65fbcbf0106
This commit is contained in:
Alexander Smundak
2020-06-05 22:46:03 +00:00
committed by Automerger Merge Worker
parent 0b25319e34 99e4fba932
commit 29faa37442
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
java/app.go
View File

@@ -158,10 +158,13 @@ func (as *AndroidAppSet) GenerateAndroidBuildActions(ctx android.ModuleContext)
// android_app_set extracts a set of APKs based on the target device // android_app_set extracts a set of APKs based on the target device
// configuration and installs this set as "split APKs". // configuration and installs this set as "split APKs".
// The set will always contain `base-master.apk` and every APK built // The extracted set always contains 'master' APK whose name is
// to the target device. All density-specific APK will be included, too, // _module_name_.apk and every split APK matching target device.
// unless PRODUCT_APPT_PREBUILT_DPI is defined (should contain comma-sepearated // The extraction of the density-specific splits depends on
// list of density names (LDPI, MDPI, HDPI, etc.) // PRODUCT_AAPT_PREBUILT_DPI variable. If present (its value should
// be a list density names: LDPI, MDPI, HDPI, etc.), only listed
// splits will be extracted. Otherwise all density-specific splits
// will be extracted.
func AndroidApkSetFactory() android.Module { func AndroidApkSetFactory() android.Module {
module := &AndroidAppSet{} module := &AndroidAppSet{}
module.AddProperties(&module.properties) module.AddProperties(&module.properties)
@@ -1183,7 +1186,7 @@ type OverrideAndroidApp struct {
android.OverrideModuleBase android.OverrideModuleBase
} }
func (i *OverrideAndroidApp) GenerateAndroidBuildActions(ctx android.ModuleContext) { func (i *OverrideAndroidApp) GenerateAndroidBuildActions(_ android.ModuleContext) {
// All the overrides happen in the base module. // All the overrides happen in the base module.
// TODO(jungjw): Check the base module type. // TODO(jungjw): Check the base module type.
} }
@@ -1204,7 +1207,7 @@ type OverrideAndroidTest struct {
android.OverrideModuleBase android.OverrideModuleBase
} }
func (i *OverrideAndroidTest) GenerateAndroidBuildActions(ctx android.ModuleContext) { func (i *OverrideAndroidTest) GenerateAndroidBuildActions(_ android.ModuleContext) {
// All the overrides happen in the base module. // All the overrides happen in the base module.
// TODO(jungjw): Check the base module type. // TODO(jungjw): Check the base module type.
} }
@@ -1226,7 +1229,7 @@ type OverrideRuntimeResourceOverlay struct {
android.OverrideModuleBase android.OverrideModuleBase
} }
func (i *OverrideRuntimeResourceOverlay) GenerateAndroidBuildActions(ctx android.ModuleContext) { func (i *OverrideRuntimeResourceOverlay) GenerateAndroidBuildActions(_ android.ModuleContext) {
// All the overrides happen in the base module. // All the overrides happen in the base module.
// TODO(jungjw): Check the base module type. // TODO(jungjw): Check the base module type.
} }
@@ -1549,7 +1552,7 @@ func (a *AndroidAppImport) Privileged() bool {
return Bool(a.properties.Privileged) return Bool(a.properties.Privileged)
} }
func (a *AndroidAppImport) DepIsInSameApex(ctx android.BaseModuleContext, dep android.Module) bool { func (a *AndroidAppImport) DepIsInSameApex(_ android.BaseModuleContext, _ android.Module) bool {
// android_app_import might have extra dependencies via uses_libs property. // android_app_import might have extra dependencies via uses_libs property.
// Don't track the dependency as we don't automatically add those libraries // Don't track the dependency as we don't automatically add those libraries
// to the classpath. It should be explicitly added to java_libs property of APEX // to the classpath. It should be explicitly added to java_libs property of APEX