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

Commit be3c7eac authored by Laura Tsai's avatar Laura Tsai
Browse files

Revert "Add scripts to generate java APIs used by Mainline modules." 

This reverts commit c92380f0.

Reason for revert:
DroidMonitor:

DroidMonitor-triggered revert due to breakage
https://android-build.googleplex.com/builds/quarterdeck?branch=git_master&target=mainline_modules_arm64-userdebug&lkgb=7898389&lkbb=7900541&fkbb=7898474,
bug 205746850

Change-Id: Ibd84dfe68dfe150b7e05b4287364d1946375bf72
parent c92380f0

apex/androidmk.go

+17 −12
Original line number Diff line number Diff line
@@ -446,18 +446,23 @@ func (a *apexBundle) androidMkForType() android.AndroidMkData { 
					fmt.Fprintf(w, dist)

				}



				distCoverageFiles(w, "ndk_apis_usedby_apex", a.nativeApisUsedByModuleFile.String())

				distCoverageFiles(w, "ndk_apis_usedby_apex", a.nativeApisBackedByModuleFile.String())

				distCoverageFiles(w, "java_apis_used_by_apex", a.javaApisUsedByModuleFile.String())

			}

		}}

				if a.apisUsedByModuleFile.String() != "" {

					goal := "apps_only"

					distFile := a.apisUsedByModuleFile.String()

					fmt.Fprintf(w, "ifneq (,$(filter $(my_register_name),$(TARGET_BUILD_APPS)))\n"+

						" $(call dist-for-goals,%s,%s:ndk_apis_usedby_apex/$(notdir %s))\n"+

						"endif\n",

						goal, distFile, distFile)

				}



func distCoverageFiles(w io.Writer, dir string, distfile string) {

	if distfile != "" {

				if a.apisBackedByModuleFile.String() != "" {

					goal := "apps_only"

					distFile := a.apisBackedByModuleFile.String()

					fmt.Fprintf(w, "ifneq (,$(filter $(my_register_name),$(TARGET_BUILD_APPS)))\n"+

			" $(call dist-for-goals,%s,%s:%s/$(notdir %s))\n"+

			"endif\n", goal, distfile, dir, distfile)

						" $(call dist-for-goals,%s,%s:ndk_apis_backedby_apex/$(notdir %s))\n"+

						"endif\n",

						goal, distFile, distFile)

				}

			}

		}}

}

apex/apex.go

+2 −3
Original line number Diff line number Diff line
@@ -424,9 +424,8 @@ type apexBundle struct { 
	isCompressed bool



	// Path of API coverage generate file

	nativeApisUsedByModuleFile   android.ModuleOutPath

	nativeApisBackedByModuleFile android.ModuleOutPath

	javaApisUsedByModuleFile     android.ModuleOutPath

	apisUsedByModuleFile   android.ModuleOutPath

	apisBackedByModuleFile android.ModuleOutPath



	// Collect the module directory for IDE info in java/jdeps.go.

	modulePaths []string

apex/builder.go

+5 −22
Original line number Diff line number Diff line
@@ -67,7 +67,6 @@ func init() { 
	pctx.HostBinToolVariable("sload_f2fs", "sload_f2fs")

	pctx.HostBinToolVariable("make_erofs", "make_erofs")

	pctx.HostBinToolVariable("apex_compression_tool", "apex_compression_tool")

	pctx.HostBinToolVariable("dexdeps", "dexdeps")

	pctx.SourcePathVariable("genNdkUsedbyApexPath", "build/soong/scripts/gen_ndk_usedby_apex.sh")

}
@@ -708,12 +707,12 @@ func (a *apexBundle) buildUnflattenedApex(ctx android.ModuleContext) { 
				"readelf":   "${config.ClangBin}/llvm-readelf",

			},

		})

		a.nativeApisUsedByModuleFile = apisUsedbyOutputFile

		a.apisUsedByModuleFile = apisUsedbyOutputFile



		var nativeLibNames []string

		var libNames []string

		for _, f := range a.filesInfo {

			if f.class == nativeSharedLib {

				nativeLibNames = append(nativeLibNames, f.stem())

				libNames = append(libNames, f.stem())

			}

		}

		apisBackedbyOutputFile := android.PathForModuleOut(ctx, a.Name()+"_backing.txt")
@@ -721,25 +720,9 @@ func (a *apexBundle) buildUnflattenedApex(ctx android.ModuleContext) { 
		rule.Command().

			Tool(android.PathForSource(ctx, "build/soong/scripts/gen_ndk_backedby_apex.sh")).

			Output(apisBackedbyOutputFile).

			Flags(nativeLibNames)

			Flags(libNames)

		rule.Build("ndk_backedby_list", "Generate API libraries backed by Apex")

		a.nativeApisBackedByModuleFile = apisBackedbyOutputFile



		var javaLibOrApkPath []android.Path

		for _, f := range a.filesInfo {

			if f.class == javaSharedLib || f.class == app {

				javaLibOrApkPath = append(javaLibOrApkPath, f.builtFile)

			}

		}

		javaApiUsedbyOutputFile := android.PathForModuleOut(ctx, a.Name()+"_using.xml")

		javaUsedByRule := android.NewRuleBuilder(pctx, ctx)

		javaUsedByRule.Command().

			Tool(android.PathForSource(ctx, "build/soong/scripts/gen_java_usedby_apex.sh")).

			BuiltTool("dexdeps").

			Output(javaApiUsedbyOutputFile).

			Inputs(javaLibOrApkPath)

		javaUsedByRule.Build("java_usedby_list", "Generate Java APIs used by Apex")

		a.javaApisUsedByModuleFile = javaApiUsedbyOutputFile

		a.apisBackedByModuleFile = apisBackedbyOutputFile



		bundleConfig := a.buildBundleConfig(ctx)

apex/testing.go

+0 −1
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ var PrepareForTestWithApexBuildComponents = android.GroupFixturePreparers( 
	android.MockFS{

		// Needed by apex.

		"system/core/rootdir/etc/public.libraries.android.txt": nil,

		"build/soong/scripts/gen_java_usedby_apex.sh":          nil,

		"build/soong/scripts/gen_ndk_backedby_apex.sh":         nil,

		// Needed by prebuilt_apex.

		"build/soong/scripts/unpack-prebuilt-apex.sh": nil,

scripts/OWNERS

+1 −1
Original line number Diff line number Diff line
@@ -3,4 +3,4 @@ per-file build-mainline-modules.sh = ngeoffray@google.com,paulduffin@google.com, 
per-file build-aml-prebuilts.sh = ngeoffray@google.com,paulduffin@google.com,mast@google.com

per-file construct_context.py = ngeoffray@google.com,calin@google.com,skvadrik@google.com

per-file conv_linker_config.py = kiyoungkim@google.com, jiyong@google.com, jooyung@google.com

per-file gen_ndk*.sh,gen_java*.sh = sophiez@google.com, allenhair@google.com
 
 No newline at end of file
 
per-file gen_ndk*.sh = sophiez@google.com, allenhair@google.com