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

Commit e8a7dc98 authored by Colin Cross's avatar Colin Cross
Browse files

Export proguard_dictionary for java_library modules 

Move exporting LOCAL_SOONG_PROGUARD_DICT from AndroidLibrary
to Library so that it is exported for java_library modules.

Test: m checkbuild
Change-Id: I27ea08ad8ba9072d0648c141cdbaf447c5268f91
parent 28c3eb68

java/androidmk.go

+4 −3
Original line number Diff line number Diff line
@@ -91,6 +91,10 @@ func (library *Library) AndroidMk() android.AndroidMkData { 
					fmt.Fprintln(w, "LOCAL_ADDITIONAL_CHECKED_MODULE +=", strings.Join(library.additionalCheckedModules.Strings(), " "))

				}



				if library.proguardDictionary != nil {

					fmt.Fprintln(w, "LOCAL_SOONG_PROGUARD_DICT :=", library.proguardDictionary.String())

				}



				// Temporary hack: export sources used to compile framework.jar to Make

				// to be used for droiddoc

				// TODO(ccross): remove this once droiddoc is in soong
@@ -373,9 +377,6 @@ func (a *AndroidLibrary) AndroidMk() android.AndroidMkData { 
		if a.aarFile != nil {

			fmt.Fprintln(w, "LOCAL_SOONG_AAR :=", a.aarFile.String())

		}

		if a.proguardDictionary != nil {

			fmt.Fprintln(w, "LOCAL_SOONG_PROGUARD_DICT :=", a.proguardDictionary.String())

		}



		if a.Name() == "framework-res" {

			fmt.Fprintln(w, "LOCAL_MODULE_PATH := $(TARGET_OUT_JAVA_LIBRARIES)")