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

Commit 2b02c96b authored by Dan Willemsen's avatar Dan Willemsen Committed by Automerger Merge Worker
Browse files

Switch to the new build-tools/platform-tools implementation am: b07ae342 am: afeaa2ca 

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

Change-Id: I34cfabdacbefeaab575f46996bcd1698cd6c288f
parents d8f882b7 afeaa2ca

android_sdk/sdk_repo_host.go

+1 −2
Original line number Diff line number Diff line
@@ -241,11 +241,10 @@ func (s *sdkRepoHost) GenerateAndroidBuildActions(ctx android.ModuleContext) { 
func (s *sdkRepoHost) AndroidMk() android.AndroidMkData {

	return android.AndroidMkData{

		Custom: func(w io.Writer, name, prefix, moduleDir string, data android.AndroidMkData) {

			// TODO: per-OS PHONY

			fmt.Fprintln(w, ".PHONY:", name, "sdk_repo", "sdk-repo-"+name)

			fmt.Fprintln(w, "sdk_repo", "sdk-repo-"+name+":", strings.Join(s.FilesToInstall().Strings(), " "))



			fmt.Fprintf(w, "$(call dist-for-goals,sdk_repo sdk-repo-%s,%s:new_%s-$(FILE_NAME_TAG).zip)\n\n", s.BaseModuleName(), s.outputFile.String(), s.outputBaseName)

			fmt.Fprintf(w, "$(call dist-for-goals,sdk_repo sdk-repo-%s,%s:%s-$(FILE_NAME_TAG).zip)\n\n", s.BaseModuleName(), s.outputFile.String(), s.outputBaseName)

		},

	}

}