commit 3f9bde87fb7f7da0ee41ff5674efee6177c88822
author Treehugger Robot <treehugger-gerrit@google.com> Sun Oct 09 01:05:31 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sun Oct 09 01:05:31 2016 +0000
tree 25e11f4f3b54d10cc4f73aa49872e41ecd6d2be9
parent 44266e97f8c10d89b1202fd333bf94abec843930
parent 2d44c2c7167812fa7782e5f3d945d320f20ff8a1

Merge "Move hardware/libhardware/include from -isystem to -I"

cc/config/x86_darwin_host.go

diff --git a/cc/config/x86_darwin_host.go b/cc/config/x86_darwin_host.go
index 1a4972e..09418c7 100644
--- a/cc/config/x86_darwin_host.go
+++ b/cc/config/x86_darwin_host.go
@@ -91,14 +91,19 @@
 		"10.11",
 	}
 
-	darwinAvailableLibraries = append(addPrefix([]string{
-		"c",
-		"dl",
-		"m",
-		"ncurses",
-		"pthread",
-		"z",
-	}, "-l"), "-framework CoreFoundation")
+	darwinAvailableLibraries = append(
+		addPrefix([]string{
+			"c",
+			"dl",
+			"m",
+			"ncurses",
+			"objc",
+			"pthread",
+			"z",
+		}, "-l"),
+		"-framework CoreFoundation",
+		"-framework IOKit",
+	)
 )
 
 const (

root.bp

diff --git a/root.bp b/root.bp
index 95f089b..d82e09d 100644
--- a/root.bp
+++ b/root.bp
@@ -15,6 +15,8 @@
     "frameworks/av",
     "frameworks/base",
     "frameworks/native",
+    "frameworks/rs",
+    "frameworks/wilhelm",
     "hardware/*",
     "libcore",
     "libnativehelper",