Merge "Support platform_apis property" am: 47ec6df851

am: 31aac9ec9f

Change-Id: I1b65d4d6977840eb3074336bdc1cb89a6c1d3489

androidmk/cmd/androidmk/android.go

@@ -179,6 +179,8 @@ func init() {
 			"LOCAL_DEX_PREOPT":                  "dex_preopt.enabled",
 			"LOCAL_DEX_PREOPT_APP_IMAGE":        "dex_preopt.app_image",
 			"LOCAL_DEX_PREOPT_GENERATE_PROFILE": "dex_preopt.profile_guided",
+
+			"LOCAL_PRIVATE_PLATFORM_APIS": "platform_apis",
 		})
 }
 

java/java.go

@@ -171,6 +171,9 @@ type CompilerDeviceProperties struct {
 	// if not blank, set to the version of the sdk to compile against
 	Sdk_version *string
 
+	// if true, compile against the platform APIs instead of an SDK.
+	Platform_apis *bool
+
 	Aidl struct {
 		// Top level directories to pass to aidl tool
 		Include_dirs []string