commit 218f65628efe3d15fe788eeaf2bf7a639daeb0ca
author Dan Willemsen <dwillemsen@google.com> Wed Jul 08 18:13:11 2015 -0700
committer Colin Cross <ccross@android.com> Tue Dec 01 15:08:01 2015 -0800
tree 60d962e024387e57930b21fa0cb9ef9a9d5c61e4
parent 979422c6c2d85b8048b0a9a478b1ee0d6a54eeed

Hybrid soong/mk build using prebuilts

Change-Id: I96daa69af27bd19c8bfbe327a1318f51c738fc03

cc/cc.go

diff --git a/cc/cc.go b/cc/cc.go
index 28ccc4c..e0c62d8 100644
--- a/cc/cc.go
+++ b/cc/cc.go
@@ -1078,6 +1078,7 @@
 	objFiles      []string
 	exportFlags   []string
 	out           string
+	systemLibs    []string
 
 	LibraryProperties CCLibraryProperties
 }
@@ -1142,6 +1143,8 @@
 		depNames.SharedLibs = append(depNames.SharedLibs, c.LibraryProperties.Shared.Shared_libs...)
 	}
 
+	c.systemLibs = c.systemSharedLibs(ctx)
+
 	return depNames
 }
 
@@ -1764,8 +1767,8 @@
 		&CCUnusedProperties{},
 	}
 
-	_, propertyStructs = common.InitAndroidArchModule(module, common.HostOrDeviceSupported(0),
-		common.Multilib(""), propertyStructs...)
+	_, propertyStructs = common.InitAndroidArchModule(module, common.HostAndDeviceDefault,
+		common.MultilibDefault, propertyStructs...)
 
 	return common.InitDefaultsModule(module, module, propertyStructs...)
 }