Move org.lineageos.platform-res.apk to system_ext (f3f3f92e) · Commits · e / os / android_build_soong

java/androidmk.go

+7 −1

Original line number	Diff line number	Diff line
		@@ -347,12 +347,18 @@ func (app *AndroidApp) AndroidMkEntries() []android.AndroidMkEntries {
		entries.SetOptionalPath("LOCAL_SOONG_PROGUARD_DICT", app.dexer.proguardDictionary)
		entries.SetOptionalPath("LOCAL_SOONG_PROGUARD_USAGE_ZIP", app.dexer.proguardUsageZip)

		if app.Name() == "framework-res" \|\| app.Name() == "org.lineageos.platform-res" {
		if app.Name() == "framework-res" {
		entries.SetString("LOCAL_MODULE_PATH", "$(TARGET_OUT_JAVA_LIBRARIES)")
		// Make base_rules.mk not put framework-res in a subdirectory called
		// framework_res.
		entries.SetBoolIfTrue("LOCAL_NO_STANDARD_LIBRARIES", true)
		}
		if app.Name() == "org.lineageos.platform-res" {
		entries.SetString("LOCAL_MODULE_PATH", "$(TARGET_OUT_SYSTEM_EXT_JAVA_LIBRARIES)")
		// Make base_rules.mk not put framework-res in a subdirectory called
		// framework_res.
		entries.SetBoolIfTrue("LOCAL_NO_STANDARD_LIBRARIES", true)
		}

		filterRRO := func(filter overlayType) android.Paths {
		var paths android.Paths

+2 −2

Original line number	Diff line number	Diff line
		@@ -449,7 +449,7 @@ func (a *AndroidApp) installPath(ctx android.ModuleContext) android.InstallPath
		// framework-res.apk is installed as system/framework/framework-res.apk
		installDir = "framework"
		} else if ctx.ModuleName() == "org.lineageos.platform-res" {
		// org.lineageos.platform-res.apk is installed as system/framework/org.lineageos.platform-res.apk
		// org.lineageos.platform-res.apk is installed as system_ext/framework/org.lineageos.platform-res.apk
		installDir = "framework"
		} else if a.Privileged() {
		installDir = filepath.Join("priv-app", a.installApkName)
		@@ -627,7 +627,7 @@ func (a *AndroidApp) generateAndroidBuildActions(ctx android.ModuleContext) {
		// framework-res.apk is installed as system/framework/framework-res.apk
		a.installDir = android.PathForModuleInstall(ctx, "framework")
		} else if ctx.ModuleName() == "org.lineageos.platform-res" {
		// org.lineageos.platform-res.apk is installed as system/framework/org.lineageos.platform-res.apk
		// org.lineageos.platform-res.apk is installed as system_ext/framework/org.lineageos.platform-res.apk
		a.installDir = android.PathForModuleInstall(ctx, "framework")
		} else if a.Privileged() {
		a.installDir = android.PathForModuleInstall(ctx, "priv-app", a.installApkName)