Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c1c3755b authored by Colin Cross's avatar Colin Cross Committed by Anton Hansson
Browse files

Export RRO resource dirs from static android_library dependencies 

RRO dirs from static android_library dependencies should be
included in the final module.

Bug: 123510624
Test: TestEnforceRRO
Change-Id: I28c45e139b187894a4ebc43d573eab5ea1be9861
parent 6ed7deaf

java/aar.go

+22 −8
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ type AndroidLibraryDependency interface { 
	Dependency

	ExportPackage() android.Path

	ExportedProguardFlagFiles() android.Paths

	ExportedRRODirs() android.Paths

	ExportedStaticPackages() android.Paths

	ExportedManifest() android.Path

}
@@ -80,6 +81,14 @@ func (a *aapt) ExportPackage() android.Path { 
	return a.exportPackage

}



func (a *aapt) ExportedRRODirs() android.Paths {

	return a.rroDirs

}



func (a *aapt) ExportedManifest() android.Path {

	return a.manifestPath

}



func (a *aapt) aapt2Flags(ctx android.ModuleContext, sdkContext sdkContext, manifestPath android.Path) (flags []string,

	deps android.Paths, resDirs, overlayDirs []globbedResourceDir, rroDirs android.Paths) {
@@ -164,7 +173,7 @@ func (a *aapt) deps(ctx android.BottomUpMutatorContext, sdkContext sdkContext) { 
}



func (a *aapt) buildActions(ctx android.ModuleContext, sdkContext sdkContext, extraLinkFlags ...string) {

	transitiveStaticLibs, staticLibManifests, libDeps, libFlags := aaptLibs(ctx, sdkContext)

	transitiveStaticLibs, staticLibManifests, staticRRODirs, libDeps, libFlags := aaptLibs(ctx, sdkContext)



	// App manifest file

	manifestFile := proptools.StringDefault(a.aaptProperties.Manifest, "AndroidManifest.xml")
@@ -174,6 +183,8 @@ func (a *aapt) buildActions(ctx android.ModuleContext, sdkContext sdkContext, ex 


	linkFlags, linkDeps, resDirs, overlayDirs, rroDirs := a.aapt2Flags(ctx, sdkContext, manifestPath)



	rroDirs = append(rroDirs, staticRRODirs...)



	linkFlags = append(linkFlags, libFlags...)

	linkDeps = append(linkDeps, libDeps...)

	linkFlags = append(linkFlags, extraLinkFlags...)
@@ -235,7 +246,7 @@ func (a *aapt) buildActions(ctx android.ModuleContext, sdkContext sdkContext, ex 


// aaptLibs collects libraries from dependencies and sdk_version and converts them into paths

func aaptLibs(ctx android.ModuleContext, sdkContext sdkContext) (transitiveStaticLibs, staticLibManifests,

	deps android.Paths, flags []string) {

	staticRRODirs, deps android.Paths, flags []string) {



	var sharedLibs android.Paths
@@ -263,6 +274,7 @@ func aaptLibs(ctx android.ModuleContext, sdkContext sdkContext) (transitiveStati 
				transitiveStaticLibs = append(transitiveStaticLibs, exportPackage)

				transitiveStaticLibs = append(transitiveStaticLibs, aarDep.ExportedStaticPackages()...)

				staticLibManifests = append(staticLibManifests, aarDep.ExportedManifest())

				staticRRODirs = append(staticRRODirs, aarDep.ExportedRRODirs()...)

			}

		}

	})
@@ -279,8 +291,9 @@ func aaptLibs(ctx android.ModuleContext, sdkContext sdkContext) (transitiveStati 
	}



	transitiveStaticLibs = android.FirstUniquePaths(transitiveStaticLibs)

	staticRRODirs = android.FirstUniquePaths(staticRRODirs)



	return transitiveStaticLibs, staticLibManifests, deps, flags

	return transitiveStaticLibs, staticLibManifests, staticRRODirs, deps, flags

}



type AndroidLibrary struct {
@@ -303,10 +316,6 @@ func (a *AndroidLibrary) ExportedStaticPackages() android.Paths { 
	return a.exportedStaticPackages

}



func (a *AndroidLibrary) ExportedManifest() android.Path {

	return a.manifestPath

}



var _ AndroidLibraryDependency = (*AndroidLibrary)(nil)



func (a *AndroidLibrary) DepsMutator(ctx android.BottomUpMutatorContext) {
@@ -426,6 +435,10 @@ func (a *AARImport) ExportedProguardFlagFiles() android.Paths { 
	return android.Paths{a.proguardFlags}

}



func (a *AARImport) ExportedRRODirs() android.Paths {

	return nil

}



func (a *AARImport) ExportedStaticPackages() android.Paths {

	return a.exportedStaticPackages

}
@@ -518,9 +531,10 @@ func (a *AARImport) GenerateAndroidBuildActions(ctx android.ModuleContext) { 
	linkFlags = append(linkFlags, "--manifest "+a.manifest.String())

	linkDeps = append(linkDeps, a.manifest)



	transitiveStaticLibs, staticLibManifests, libDeps, libFlags := aaptLibs(ctx, sdkContext(a))

	transitiveStaticLibs, staticLibManifests, staticRRODirs, libDeps, libFlags := aaptLibs(ctx, sdkContext(a))



	_ = staticLibManifests

	_ = staticRRODirs



	linkDeps = append(linkDeps, libDeps...)

	linkFlags = append(linkFlags, libFlags...)

java/app.go

+0 −4
Original line number Diff line number Diff line
@@ -95,10 +95,6 @@ func (a *AndroidApp) ExportedStaticPackages() android.Paths { 
	return nil

}



func (a *AndroidApp) ExportedManifest() android.Path {

	return a.manifestPath

}



var _ AndroidLibraryDependency = (*AndroidApp)(nil)



type Certificate struct {

java/app_test.go

+10 −2
Original line number Diff line number Diff line
@@ -150,8 +150,13 @@ func TestEnforceRRO(t *testing.T) { 
					"device/vendor/blah/overlay/bar/res/values/strings.xml",

				},

			},



			rroDirs: map[string][]string{

				"foo": []string{"device/vendor/blah/overlay/foo/res"},

				"foo": []string{

					"device/vendor/blah/overlay/foo/res",

					// Enforce RRO on "foo" could imply RRO on static dependencies, but for now it doesn't.

					// "device/vendor/blah/overlay/lib/res",

				},

				"bar": nil,

			},

		},
@@ -172,7 +177,10 @@ func TestEnforceRRO(t *testing.T) { 
				"bar": []string{"device/vendor/blah/static_overlay/bar/res/values/strings.xml"},

			},

			rroDirs: map[string][]string{

				"foo": []string{"device/vendor/blah/overlay/foo/res"},

				"foo": []string{

					"device/vendor/blah/overlay/foo/res",

					"device/vendor/blah/overlay/lib/res",

				},

				"bar": []string{"device/vendor/blah/overlay/bar/res"},

			},

		},