Set LOCAL_PATH for each prebuilt module am: 2630213418 am: 3f7fda3150

am: c619c9cab9

* commit 'c619c9cab98f658d12ae14b609dc28dbba8c8505':
  Set LOCAL_PATH for each prebuilt module

Change-Id: I1cdd5197c1cbbd860eafaed4ea79bb57bb992208
This commit is contained in:
Colin Cross
2016-05-13 20:38:26 +00:00
committed by android-build-merger

View File

@@ -93,7 +93,6 @@ func (c *androidMkSingleton) GenerateBuildActions(ctx blueprint.SingletonContext
func translateAndroidMk(ctx blueprint.SingletonContext, mkFile string, mods []AndroidModule) error {
buf := &bytes.Buffer{}
fmt.Fprintln(buf, "LOCAL_PATH := $(TOP)")
fmt.Fprintln(buf, "LOCAL_MODULE_MAKEFILE := $(lastword $(MAKEFILE_LIST))")
for _, mod := range mods {
@@ -184,10 +183,11 @@ func translateAndroidMkModule(ctx blueprint.SingletonContext, w io.Writer, mod b
}
fmt.Fprintln(w, "\ninclude $(CLEAR_VARS)")
fmt.Fprintln(w, "LOCAL_PATH :=", filepath.Dir(ctx.BlueprintFile(mod)))
fmt.Fprintln(w, "LOCAL_MODULE :=", name)
fmt.Fprintln(w, "LOCAL_MODULE_CLASS :=", data.Class)
fmt.Fprintln(w, "LOCAL_MULTILIB :=", amod.commonProperties.Compile_multilib)
fmt.Fprintln(w, "LOCAL_SRC_FILES :=", data.OutputFile.String())
fmt.Fprintln(w, "LOCAL_PREBUILT_MODULE_FILE :=", data.OutputFile.String())
archStr := amod.Arch().ArchType.String()
if amod.Host() {