diff options
| author | Keun young Park <keunyoung@google.com> | 2012-05-31 19:53:43 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-05-31 19:53:43 -0700 |
| commit | 096cf9f33045969c122e5f1a3dd81d5ec8bbb14c (patch) | |
| tree | b900d5a86affbc41802a43f475605ec71ff8cb1a | |
| parent | e1a5b9958574e652b599d554f4ddcff1f67612e7 (diff) | |
| parent | 28ffaf65f3f6728e22c035f67b5ea0548d3ef8fe (diff) | |
| download | device_samsung_tuna-096cf9f33045969c122e5f1a3dd81d5ec8bbb14c.zip device_samsung_tuna-096cf9f33045969c122e5f1a3dd81d5ec8bbb14c.tar.gz device_samsung_tuna-096cf9f33045969c122e5f1a3dd81d5ec8bbb14c.tar.bz2 | |
am 8a1d4ed8: enable maguro PDK build
* commit '28ffaf65f3f6728e22c035f67b5ea0548d3ef8fe':
enable maguro PDK build
| -rw-r--r-- | device.mk | 12 | ||||
| -rw-r--r-- | keymaster/keymaster_tuna.cpp | 2 |
2 files changed, 6 insertions, 8 deletions
@@ -141,12 +141,10 @@ PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.hardware.nfc.xml:system/etc/permissions/android.hardware.nfc.xml \ frameworks/native/data/etc/android.software.sip.voip.xml:system/etc/permissions/android.software.sip.voip.xml \ frameworks/native/data/etc/android.hardware.usb.accessory.xml:system/etc/permissions/android.hardware.usb.accessory.xml \ - frameworks/native/data/etc/android.hardware.usb.host.xml:system/etc/permissions/android.hardware.usb.host.xml \ - packages/wallpapers/LivePicker/android.software.live_wallpaper.xml:system/etc/permissions/android.software.live_wallpaper.xml + frameworks/native/data/etc/android.hardware.usb.host.xml:system/etc/permissions/android.hardware.usb.host.xml -# HACK: copy panda init for now to boot on both boards -PRODUCT_COPY_FILES += \ - device/ti/panda/init.omap4pandaboard.rc:root/init.omap4pandaboard.rc +PRODUCT_COPY_FILES += $(call add-to-product-copy-files-if-exists,\ +packages/wallpapers/LivePicker/android.software.live_wallpaper.xml:system/etc/permissions/android.software.live_wallpaper.xml) # Melfas touchscreen firmware PRODUCT_COPY_FILES += \ @@ -158,8 +156,8 @@ PRODUCT_COPY_FILES += \ device/samsung/tuna/dock.png:system/vendor/res/images/dock/dock.png # Commands to migrate prefs from com.android.nfc3 to com.android.nfc -PRODUCT_COPY_FILES += \ - packages/apps/Nfc/migrate_nfc.txt:system/etc/updatecmds/migrate_nfc.txt +PRODUCT_COPY_FILES += $(call add-to-product-copy-files-if-exists,\ +packages/apps/Nfc/migrate_nfc.txt:system/etc/updatecmds/migrate_nfc.txt) # file that declares the MIFARE NFC constant PRODUCT_COPY_FILES += \ diff --git a/keymaster/keymaster_tuna.cpp b/keymaster/keymaster_tuna.cpp index 15c56f2..0868072 100644 --- a/keymaster/keymaster_tuna.cpp +++ b/keymaster/keymaster_tuna.cpp @@ -36,7 +36,7 @@ #include <cryptoki.h> #include <pkcs11.h> -#include <UniquePtr.h> +#include <utils/UniquePtr.h> /** The size of a key ID in bytes */ |