diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-03-25 16:11:47 -0700 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2010-03-25 16:22:27 -0700 |
| commit | 4b63a4094f2d0cdb83c65f69126ff5e06fd6ac4d (patch) | |
| tree | f366c1952b11c0b6881bf2934db004e4e3c69eac | |
| parent | 2c3c3f263ba90f0c2aa1030ce0687458b137fa87 (diff) | |
| download | passion-4b63a4094f2d0cdb83c65f69126ff5e06fd6ac4d.tar.gz | |
Separate BoardConfig between passion and passionc
This'll help on the open-source side, where having
the proprietary files for one variant doesn't imply
having access to those files for the other variant.
Bug: 1869158
Change-Id: I5dbc6340de8ae92fae1e7502c258fcb82299b06a
| -rw-r--r-- | BoardConfig.mk | 8 | ||||
| -rwxr-xr-x | extract-files.sh | 3 |
2 files changed, 9 insertions, 2 deletions
diff --git a/BoardConfig.mk b/BoardConfig.mk index c317658..8024975 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -20,6 +20,14 @@ # definition file). # +# WARNING: This line must come *before* including the proprietary +# variant, so that it gets overwritten by the parent (which goes +# against the traditional rules of inheritance). +USE_CAMERA_STUB := true + +# inherit from the proprietary version +-include vendor/htc/passion/BoardConfigVendor.mk + # Get the generic variables that are common between all versions # of passion include device/htc/passion-common/BoardConfigCommon.mk diff --git a/extract-files.sh b/extract-files.sh index 2a6865a..294be32 100755 --- a/extract-files.sh +++ b/extract-files.sh @@ -129,8 +129,7 @@ DEVICE_PACKAGE_OVERLAYS := vendor/htc/__DEVICE__/overlay EOF -mkdir -p ../../../vendor/htc/passion-common -(cat << EOF) | sed s/__DEVICE__/$DEVICE/g > ../../../vendor/htc/passion-common/BoardConfigCommonVendor.mk +(cat << EOF) | sed s/__DEVICE__/$DEVICE/g > ../../../vendor/htc/passion/BoardConfigVendor.mk # Copyright (C) 2010 The Android Open Source Project # # Licensed under the Apache License, Version 2.0 (the "License"); |