diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-09-24 09:37:11 -0700 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2010-09-24 09:37:11 -0700 |
| commit | 84fc60c44f722d55f0814f4ff107417a3ac73ed7 (patch) | |
| tree | fd6e9919850a3460290f6c2b2bf44fe2b46a2059 | |
| parent | d1154f521f49c3aa07daaf56c5fe31ef84c9ec70 (diff) | |
| download | passion-84fc60c44f722d55f0814f4ff107417a3ac73ed7.tar.gz | |
Factor out the manufacturer name (and the device name as well)
Change-Id: I24354b0a631dc3756077fc5dc1c400cb66ae0e3c
| -rwxr-xr-x | setup-makefiles.sh | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/setup-makefiles.sh b/setup-makefiles.sh index 9f41e91..d5f3107 100755 --- a/setup-makefiles.sh +++ b/setup-makefiles.sh @@ -15,10 +15,11 @@ # limitations under the License. DEVICE=passion +MANUFACTURER=htc -mkdir -p ../../../vendor/htc/$DEVICE +mkdir -p ../../../vendor/$MANUFACTURER/$DEVICE -(cat << EOF) | sed s/__DEVICE__/$DEVICE/g > ../../../vendor/htc/$DEVICE/$DEVICE-vendor.mk +(cat << EOF) | sed s/__DEVICE__/$DEVICE/g | sed s/__MANUFACTURER__/$MANUFACTURER/g > ../../../vendor/$MANUFACTURER/$DEVICE/$DEVICE-vendor.mk # Copyright (C) 2010 The Android Open Source Project # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -33,7 +34,7 @@ mkdir -p ../../../vendor/htc/$DEVICE # See the License for the specific language governing permissions and # limitations under the License. -# This file is generated by device/htc/__DEVICE__/setup-makefiles.sh +# This file is generated by device/__MANUFACTURER__/__DEVICE__/setup-makefiles.sh # Live wallpaper packages PRODUCT_PACKAGES := \\ @@ -48,12 +49,12 @@ PRODUCT_COPY_FILES := \\ packages/wallpapers/LivePicker/android.software.live_wallpaper.xml:/system/etc/permissions/android.software.live_wallpaper.xml # Pick up overlay for features that depend on non-open-source files -DEVICE_PACKAGE_OVERLAYS := vendor/htc/__DEVICE__/overlay +DEVICE_PACKAGE_OVERLAYS := vendor/__MANUFACTURER__/__DEVICE__/overlay -\$(call inherit-product, vendor/htc/__DEVICE__/__DEVICE__-vendor-blobs.mk) +\$(call inherit-product, vendor/__MANUFACTURER__/__DEVICE__/device-vendor-blobs.mk) EOF -(cat << EOF) | sed s/__DEVICE__/$DEVICE/g > ../../../vendor/htc/passion/BoardConfigVendor.mk +(cat << EOF) | sed s/__DEVICE__/$DEVICE/g | sed s/__MANUFACTURER__/$MANUFACTURER/g > ../../../vendor/$MANUFACTURER/$DEVICE/BoardConfigVendor.mk # Copyright (C) 2010 The Android Open Source Project # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -68,15 +69,15 @@ EOF # See the License for the specific language governing permissions and # limitations under the License. -# This file is generated by device/htc/__DEVICE__/setup-makefiles.sh +# This file is generated by device/__MANUFACTURER__/__DEVICE__/setup-makefiles.sh BOARD_GPS_LIBRARIES := libgps USE_CAMERA_STUB := false EOF -mkdir -p ../../../vendor/htc/passion/overlay/packages/apps/Launcher2/res/layout -(cat << EOF) | sed s/__DEVICE__/$DEVICE/g > ../../../vendor/htc/passion/overlay/packages/apps/Launcher2/res/layout/all_apps.xml +mkdir -p ../../../vendor/$MANUFACTURER/$DEVICE/overlay/packages/apps/Launcher2/res/layout +(cat << EOF) | sed s/__DEVICE__/$DEVICE/g | sed s/__MANUFACTURER__/$MANUFACTURER/g > ../../../vendor/$MANUFACTURER/$DEVICE/overlay/packages/apps/Launcher2/res/layout/all_apps.xml <?xml version="1.0" encoding="utf-8"?> <!-- Copyright (C) 2010 The Android Open Source Project @@ -93,7 +94,7 @@ mkdir -p ../../../vendor/htc/passion/overlay/packages/apps/Launcher2/res/layout limitations under the License. --> -<!-- This file is generated by device/htc/__DEVICE__/setup-makefiles.sh --> +<!-- This file is generated by device/__MANUFACTURER__/__DEVICE__/setup-makefiles.sh --> <!-- switch to all_apps_3d on devices that support RenderScript --> <merge xmlns:android="http://schemas.android.com/apk/res/android"> |