Merge "sh_binary can be included in APEX" (fa8f1370) · Commits · e / os / android_build_soong

apex/apex.go

+12 −2

Original line number	Diff line number	Diff line
		@@ -274,6 +274,7 @@ const (
		etc apexFileClass = iota
		nativeSharedLib
		nativeExecutable
		shBinary
		javaSharedLib
		)

		@@ -333,7 +334,7 @@ func (class apexFileClass) NameInMake() string {
		return "ETC"
		case nativeSharedLib:
		return "SHARED_LIBRARIES"
		case nativeExecutable:
		case nativeExecutable, shBinary:
		return "EXECUTABLES"
		case javaSharedLib:
		return "JAVA_LIBRARIES"
		@@ -570,6 +571,12 @@ func getCopyManifestForExecutable(cc *cc.Module) (fileToCopy android.Path, dirIn
		return
		}

		func getCopyManifestForShBinary(sh *android.ShBinary) (fileToCopy android.Path, dirInApex string) {
		dirInApex = filepath.Join("bin", sh.SubDir())
		fileToCopy = sh.OutputFile()
		return
		}

		func getCopyManifestForJavaLibrary(java *java.Library) (fileToCopy android.Path, dirInApex string) {
		dirInApex = "javalib"
		fileToCopy = java.DexJarFile()
		@@ -626,8 +633,11 @@ func (a *apexBundle) GenerateAndroidBuildActions(ctx android.ModuleContext) {
		fileToCopy, dirInApex := getCopyManifestForExecutable(cc)
		filesInfo = append(filesInfo, apexFile{fileToCopy, depName, dirInApex, nativeExecutable, cc, cc.Symlinks()})
		return true
		} else if sh, ok := child.(*android.ShBinary); ok {
		fileToCopy, dirInApex := getCopyManifestForShBinary(sh)
		filesInfo = append(filesInfo, apexFile{fileToCopy, depName, dirInApex, shBinary, sh, nil})
		} else {
		ctx.PropertyErrorf("binaries", "%q is not a cc_binary module", depName)
		ctx.PropertyErrorf("binaries", "%q is neithher cc_binary nor sh_binary", depName)
		}
		case javaLibTag:
		if java, ok := child.(*java.Library); ok {

apex/apex_test.go

+29 −0

Original line number	Diff line number	Diff line
		@@ -47,6 +47,7 @@ func testApex(t testing.T, bp string) android.TestContext {
		ctx.RegisterModuleType("llndk_library", android.ModuleFactoryAdaptor(cc.LlndkLibraryFactory))
		ctx.RegisterModuleType("toolchain_library", android.ModuleFactoryAdaptor(cc.ToolchainLibraryFactory))
		ctx.RegisterModuleType("prebuilt_etc", android.ModuleFactoryAdaptor(android.PrebuiltEtcFactory))
		ctx.RegisterModuleType("sh_binary", android.ModuleFactoryAdaptor(android.ShBinaryFactory))
		ctx.PreDepsMutators(func(ctx android.RegisterMutatorsContext) {
		ctx.BottomUp("image", cc.ImageMutator).Parallel()
		ctx.BottomUp("link", cc.LinkageMutator).Parallel()
		@@ -975,3 +976,31 @@ func TestApexWithTarget(t *testing.T) {
		ensureListContains(t, ctx.ModuleVariantsForTests("mylib_common"), "android_arm64_armv8-a_core_shared")
		ensureListContains(t, ctx.ModuleVariantsForTests("mylib2"), "android_arm64_armv8-a_core_shared")
		}

		func TestApexWithShBinary(t *testing.T) {
		ctx := testApex(t, `
		apex {
		name: "myapex",
		key: "myapex.key",
		binaries: ["myscript"],
		}

		apex_key {
		name: "myapex.key",
		public_key: "testkey.avbpubkey",
		private_key: "testkey.pem",
		}

		sh_binary {
		name: "myscript",
		src: "mylib.cpp",
		filename: "myscript.sh",
		sub_dir: "script",
		}
		`)

		apexRule := ctx.ModuleForTests("myapex", "android_common_myapex").Rule("apexRule")
		copyCmds := apexRule.Args["copy_commands"]

		ensureContains(t, copyCmds, "image.apex/bin/script/myscript.sh")
		}