diff options
| author | George Chang <georgekgchang@google.com> | 2020-02-19 22:33:36 +0800 |
|---|---|---|
| committer | George Chang <georgekgchang@google.com> | 2020-02-19 22:33:36 +0800 |
| commit | 5da9750e8d70e8e3db7d6e54741ae64f55319bd4 (patch) | |
| tree | cea1bbd6d029a1fd1eb17fb9c359a4273bfa5243 /device-sargo.mk | |
| parent | 73e0f7dc00fcf9a8bc29188750a776d2bfe2b465 (diff) | |
| parent | 1063573c5b3e553e2d919d64c2db5882f84c1521 (diff) | |
| download | bonito-5da9750e8d70e8e3db7d6e54741ae64f55319bd4.tar.gz | |
resolve merge conflicts of 1063573c5b3e553e2d919d64c2db5882f84c1521 to master
Test: I solemnly swear I tested this conflict resolution.
Bug: None
Change-Id: I4d41f42d993e1480d53f38a55e89da5992e65b4e
Diffstat (limited to 'device-sargo.mk')
| -rw-r--r-- | device-sargo.mk | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/device-sargo.mk b/device-sargo.mk index bca4811e..01cf5842 100644 --- a/device-sargo.mk +++ b/device-sargo.mk @@ -24,7 +24,11 @@ PRODUCT_PACKAGES += \ TelephonyOverlay2018MidyearSargo PRODUCT_COPY_FILES += \ - device/google/bonito/nfc/libnfc-nxp.sargo.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libnfc-nxp.conf + device/google/bonito/nfc/libnfc-nxp.sargo.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libnfc-nxp.conf \ + device/google/bonito/nfc/libnfc-nxp.sargo.uicc.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libnfc-nxp-G020E.conf \ + device/google/bonito/nfc/libnfc-nxp.sargo.uicc.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libnfc-nxp-G020F.conf \ + device/google/bonito/nfc/libnfc-nxp.sargo.uicc.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libnfc-nxp-G020G.conf \ + device/google/bonito/nfc/libnfc-nxp.sargo.ese.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libnfc-nxp-G020H.conf PRODUCT_PRODUCT_PROPERTIES += ro.com.google.ime.height_ratio=1.2 |