commit | 045deec750f4a981e5b39e1e871c0adcc174cfd4 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Wed Feb 20 16:18:32 2019 -0800 |
committer | Xin Li <delphij@google.com> | Wed Feb 20 16:18:32 2019 -0800 |
tree | 4ff6124d3ca5e24f3bcaf457363b51bf28276ae3 | |
parent | df18e50fe8d430b87faa1e1e2f69176982701160 [diff] | |
parent | 16c81d194a9b88c714b639567c768ab9102ba71c [diff] |
DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master Bug: 120848293 Change-Id: I99d731f186018370947140681a868e55b3c553ca
diff --git a/third_party/NXPNFC_P61_JCOP_Kit/src/Ala.cpp b/third_party/NXPNFC_P61_JCOP_Kit/src/Ala.cpp index 8b1f17f..1ade696 100644 --- a/third_party/NXPNFC_P61_JCOP_Kit/src/Ala.cpp +++ b/third_party/NXPNFC_P61_JCOP_Kit/src/Ala.cpp
@@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include <cutils/log.h> +#include <log/log.h> #include <Ala.h> #include <AlaLib.h> #include <IChannel.h>
diff --git a/third_party/NXPNFC_P61_JCOP_Kit/src/AlaLib.cpp b/third_party/NXPNFC_P61_JCOP_Kit/src/AlaLib.cpp index 6132889..9aeafc2 100644 --- a/third_party/NXPNFC_P61_JCOP_Kit/src/AlaLib.cpp +++ b/third_party/NXPNFC_P61_JCOP_Kit/src/AlaLib.cpp
@@ -16,7 +16,7 @@ #include "Ala.h" #include "AlaLib.h" #include <data_types.h> -#include <cutils/log.h> +#include <log/log.h> #include <dirent.h> static INT16 alaHandle;
diff --git a/third_party/NXPNFC_P61_JCOP_Kit/src/JcDnld.cpp b/third_party/NXPNFC_P61_JCOP_Kit/src/JcDnld.cpp index 32574fe..dba3971 100644 --- a/third_party/NXPNFC_P61_JCOP_Kit/src/JcDnld.cpp +++ b/third_party/NXPNFC_P61_JCOP_Kit/src/JcDnld.cpp
@@ -16,7 +16,7 @@ #include "JcDnld.h" #include "JcopOsDownload.h" #include <data_types.h> -#include <cutils/log.h> +#include <log/log.h> JcopOsDwnld *jd; IChannel_t *channel;
diff --git a/third_party/NXPNFC_P61_JCOP_Kit/src/JcopOsDownload.cpp b/third_party/NXPNFC_P61_JCOP_Kit/src/JcopOsDownload.cpp index 500b8fc..1cfc3cb 100644 --- a/third_party/NXPNFC_P61_JCOP_Kit/src/JcopOsDownload.cpp +++ b/third_party/NXPNFC_P61_JCOP_Kit/src/JcopOsDownload.cpp
@@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include <cutils/log.h> +#include <log/log.h> #include <semaphore.h> #include <AlaLib.h> #include <JcopOsDownload.h>