commit 3e0ffcf2f5122aebe3c4f64bbffbe20628e4bf29
author Treehugger Robot <treehugger-gerrit@google.com> Thu Mar 30 04:47:40 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Mar 30 04:47:40 2017 +0000
tree dee1fad69c24e245aa86cc0e69bc7251e59f6e35
parent 280802c102187b16e4677f11d48dcbee7c513ae5
parent d2130a93594455a62d842930e9c03908a2f5b435

Merge "Use a timestamp file for preprocessed_ndk_headers."

android/androidmk.go

diff --git a/android/androidmk.go b/android/androidmk.go
index d55cdca..f606522 100644
--- a/android/androidmk.go
+++ b/android/androidmk.go
@@ -175,19 +175,21 @@
 
 	if data.Custom != nil {
 		prefix := ""
-		switch amod.Os().Class {
-		case Host:
-			prefix = "HOST_"
-		case HostCross:
-			prefix = "HOST_CROSS_"
-		case Device:
-			prefix = "TARGET_"
+		if amod.ArchSpecific() {
+			switch amod.Os().Class {
+			case Host:
+				prefix = "HOST_"
+			case HostCross:
+				prefix = "HOST_CROSS_"
+			case Device:
+				prefix = "TARGET_"
 
-		}
+			}
 
-		config := ctx.Config().(Config)
-		if amod.Arch().ArchType != config.Targets[amod.Os().Class][0].Arch.ArchType {
-			prefix = "2ND_" + prefix
+			config := ctx.Config().(Config)
+			if amod.Arch().ArchType != config.Targets[amod.Os().Class][0].Arch.ArchType {
+				prefix = "2ND_" + prefix
+			}
 		}
 
 		return data.Custom(w, name, prefix, filepath.Dir(ctx.BlueprintFile(mod)))