commit d784cff36a803c0fe67358944844c29f8d3a4178
author Colin Cross <ccross@android.com> Wed Sep 14 16:50:18 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Sep 14 16:50:18 2016 +0000
tree bdfb0910ef802089b53cea3981b246a28a714940
parent dded09236861eee1a0eda2a3ebe8024a0e749930
parent 178a5098550a630bc242c7322abc2a7f59369a77

Merge "Replace PropertyCustomizer with hooks"

android/arch.go

diff --git a/android/arch.go b/android/arch.go
index b653ce6..7ccd003 100644
--- a/android/arch.go
+++ b/android/arch.go
@@ -294,9 +294,13 @@
 		if multilib == "" {
 			multilib = module.base().commonProperties.Default_multilib
 		}
-		prefer32 := false
-		if class == Device {
+		var prefer32 bool
+		switch class {
+		case Device:
 			prefer32 = mctx.AConfig().DevicePrefer32BitExecutables()
+		case HostCross:
+			// Windows builds always prefer 32-bit
+			prefer32 = true
 		}
 		targets, err := decodeMultilib(multilib, targets, prefer32)
 		if err != nil {

cc/gen.go

diff --git a/cc/gen.go b/cc/gen.go
index c344cf6..b35eee5 100644
--- a/cc/gen.go
+++ b/cc/gen.go
@@ -25,8 +25,8 @@
 )
 
 func init() {
-	pctx.SourcePathVariable("lexCmd", "prebuilts/misc/${HostPrebuiltTag}/flex/flex-2.5.39")
-	pctx.SourcePathVariable("yaccCmd", "prebuilts/misc/${HostPrebuiltTag}/bison/bison")
+	pctx.SourcePathVariable("lexCmd", "prebuilts/misc/${config.HostPrebuiltTag}/flex/flex-2.5.39")
+	pctx.SourcePathVariable("yaccCmd", "prebuilts/misc/${config.HostPrebuiltTag}/bison/bison")
 	pctx.SourcePathVariable("yaccDataDir", "external/bison/data")
 }
 

root.bp

diff --git a/root.bp b/root.bp
index 12ca162..95f089b 100644
--- a/root.bp
+++ b/root.bp
@@ -24,6 +24,10 @@
     "system/core/*",
     "system/extras/*",
     "system/keymaster",
+    "system/hwservicemanager",
+    "system/libhidl",
+    "system/libhwbinder",
     "system/media/*",
     "system/security/*",
+    "system/tools/*",
 ]