diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2018-11-19 23:21:35 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2018-11-19 23:21:35 +0000 |
| commit | 62b5f18456e015baf3b376acb3e879b6d68f5270 (patch) | |
| tree | d8593a27fb16929ed501d2c08f2ac96b7a74496c | |
| parent | ee2de1a593ea3475abf874e390f576a53cc30830 (diff) | |
| parent | b69855391a722d90e97c724cb38aa62d8f93019c (diff) | |
Merge cherrypicks of [5556008, 5556009, 5556010, 5556011, 5556012, 5556013, 5554791, 5554792, 5554793] into pi-qpr2-release
Change-Id: I7803afe255e5b0179c4a34478e2bb673e0e0594e
| -rw-r--r-- | device.mk | 4 |
1 files changed, 1 insertions, 3 deletions
@@ -388,9 +388,7 @@ PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \ PRODUCT_COPY_FILES += \ device/google/crosshatch/nfc/libnfc-nci.conf:$(TARGET_COPY_OUT_SYSTEM)/etc/libnfc-nci.conf \ - device/google/crosshatch/nfc/libese-nxp.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libese-nxp.conf \ - device/google/crosshatch/felica/loaderservice_updater_1.lss:$(TARGET_COPY_OUT_VENDOR)/etc/loaderservice_updater_1.lss \ - device/google/crosshatch/felica/loaderservice_updater_2.lss:$(TARGET_COPY_OUT_VENDOR)/etc/loaderservice_updater_2.lss + device/google/crosshatch/nfc/libese-nxp.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libese-nxp.conf # TODO(b/72443662) PRODUCT_COPY_FILES += \ |