summaryrefslogtreecommitdiff
path: root/sailfish
diff options
context:
space:
mode:
authorMichael Schwartz <schwartzmi@google.com>2017-04-14 18:59:38 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-04-14 18:59:38 +0000
commit6ac700526572a2a55f0915475e0bfb6be191d841 (patch)
treebb67eb7e37ca2c5b84c6cafc94592fc466d0b2c4 /sailfish
parent93950f185d4d672623952b97f1f3604570c6ae89 (diff)
parenta37c85b25c279806a77b821236d2ee1451afaca3 (diff)
Merge "Declare the location of device manifest" into oc-dev
am: a37c85b25c Change-Id: Idb6391995f7ab227c22f3d7c4eed8a8c58f655ad
Diffstat (limited to 'sailfish')
-rw-r--r--sailfish/BoardConfig.mk2
1 files changed, 2 insertions, 0 deletions
diff --git a/sailfish/BoardConfig.mk b/sailfish/BoardConfig.mk
index c8694a82..16ad2484 100644
--- a/sailfish/BoardConfig.mk
+++ b/sailfish/BoardConfig.mk
@@ -201,3 +201,5 @@ NXP_CHIP_TYPE := PN551
BOARD_PERFSETUP_SCRIPT := platform_testing/scripts/perf-setup/sailin-setup.sh
BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED := true
+
+DEVICE_MANIFEST_FILE := device/google/marlin/manifest.xml