From b2123aa1df97dca26c73ef1f467ee043dc8c08c3 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Fri, 5 May 2017 13:37:11 -0700 Subject: [PATCH] Add a variable to disable modules in the PDK Not plumbed through yet, but will at least prevent us from losing track of which modules will not build in the PDK. Test: builds Change-Id: I4c1a0e39104b104dc1ff23c4391d5e83b3002d3a --- android/variable.go | 4 ++++ androidmk/cmd/androidmk/android.go | 7 +++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/android/variable.go b/android/variable.go index 03c797f73..e692fafb2 100644 --- a/android/variable.go +++ b/android/variable.go @@ -81,6 +81,10 @@ type variableProperties struct { Cflags []string Cppflags []string } + + Pdk struct { + Enabled *bool + } } `android:"arch_variant"` } diff --git a/androidmk/cmd/androidmk/android.go b/androidmk/cmd/androidmk/android.go index 82c5dac4f..3c3e2a1b2 100644 --- a/androidmk/cmd/androidmk/android.go +++ b/androidmk/cmd/androidmk/android.go @@ -637,8 +637,11 @@ var conditionalTranslations = map[string]map[bool]string{ true: "target.linux", false: "target.not_linux"}, "(,$(TARGET_BUILD_APPS))": { - false: "product_variables.unbundled_build", - }, + false: "product_variables.unbundled_build"}, + "($(TARGET_BUILD_PDK),true)": { + true: "product_variables.pdk"}, + "($(TARGET_BUILD_PDK), true)": { + true: "product_variables.pdk"}, } func mydir(args []string) string {