Update sources to compile on Android Nougat

common/hardware/libhardware/libkeymaster/include/schw/keymaster_aw.h

@@ -16,8 +16,7 @@
 #ifndef __AWKEYMASTER_MODULEAPI_INCLUDE_H_
 #define __AWKEYMASTER_MODULEAPI_INCLUDE_H_
 
-#include <hardware/keymaster.h>
-
+#include <hardware/keymaster0.h>
 
 int aw_keymaster_req_libsym(void *handle);
 

common/hardware/libhardware/libkeymaster/include/schw/log_aw.h

@@ -3,7 +3,7 @@
 #define __AWKEYMASTER_LOGAPI_INCLUDE_H_
 
 #include <utils/Log.h>
-#include <hardware/keymaster.h>
+#include <hardware/keymaster0.h>
 
 #ifdef __cplusplus
 extern "C" {

common/hardware/libhardware/libkeymaster/module_sunxi.cpp

@@ -13,13 +13,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
+#define keymaster_device keymaster0_device
+#define keymaster_device_t keymaster0_device_t
+
 #include <errno.h>
 #include <string.h>
 #include <stdint.h>
 #include <keymaster_aw.h>
 #include <log_aw.h>
 #include <hardware/hardware.h>
-#include <hardware/keymaster.h>
+#include <hardware/keymaster0.h>
 #include <nativehelper/UniquePtr.h>
 #include <dlfcn.h>
 #include <cutils/log.h>
@@ -452,20 +456,16 @@ static int aw_device_open(const hw_module_t* module, const char* name,
 }
 
 static struct hw_module_methods_t keystore_module_methods = {
-    open: aw_device_open,
+    .open = aw_device_open,
 };
 
-struct keystore_module HAL_MODULE_INFO_SYM
+struct hw_module_t HAL_MODULE_INFO_SYM
 __attribute__ ((visibility ("default"))) = {
-    common: {
-        tag: HARDWARE_MODULE_TAG,
-        module_api_version: KEYMASTER_MODULE_API_VERSION_0_2,
-        hal_api_version: HARDWARE_HAL_API_VERSION,
-        id: KEYSTORE_HARDWARE_MODULE_ID,
-        name: "Keymaster AllSoftwinnertech HAL",
-        author: "The Android Open Source Project",
-        methods: &keystore_module_methods,
-        dso: 0,
-        reserved: {},
-    },
+  .tag = HARDWARE_MODULE_TAG,
+  .module_api_version = KEYMASTER_MODULE_API_VERSION_0_2,
+  .hal_api_version = HARDWARE_HAL_API_VERSION,
+  .id = KEYSTORE_HARDWARE_MODULE_ID,
+  .name = "Keymaster AllSoftwinnertech HAL",
+  .author = "The Android Open Source Project",
+  .methods = &keystore_module_methods,
 };

common/hardware/libhardware/libsensors/aw_sensors/AccelSensor.cpp

@@ -22,6 +22,7 @@
 #include <poll.h>
 #include <unistd.h>
 #include <dirent.h>
+#include <string.h>
 #include <sys/select.h>
 #include <dlfcn.h>
 #include <cutils/log.h>
@@ -394,4 +395,3 @@ int AccelSensor::getEnable(int32_t handle) {
 }
 
 /*****************************************************************************/
-

common/hardware/libhardware/libsensors/aw_sensors/InputEventReader.cpp

@@ -18,6 +18,7 @@
 #include <errno.h>
 #include <unistd.h>
 #include <poll.h>
+#include <memory.h>
 
 #include <sys/cdefs.h>
 #include <sys/types.h>

common/hardware/libhardware/libsensors/aw_sensors/LightSensor.cpp

@@ -19,6 +19,7 @@
 #include <errno.h>
 #include <math.h>
 #include <stdlib.h>
+#include <memory.h>
 #include <poll.h>
 #include <unistd.h>
 #include <dirent.h>
@@ -215,5 +216,3 @@ void LightSensor::processEvent(int code, int value) {
 
 
 }
-
-

common/hardware/libhardware/libsensors/aw_sensors/PressSensor.cpp

@@ -22,6 +22,7 @@
 #include <poll.h>
 #include <unistd.h>
 #include <dirent.h>
+#include <string.h>
 #include <sys/select.h>
 #include <dlfcn.h>
 #include <cutils/log.h>
@@ -316,4 +317,3 @@ int PressSensor::sensor_get_class_path(char *class_path)
 }
 
 /*****************************************************************************/
-

common/hardware/libhardware/libsensors/aw_sensors/ProximitySensor.cpp

@@ -19,6 +19,7 @@
 #include <math.h>
 #include <poll.h>
 #include <unistd.h>
+#include <memory.h>
 #include <dirent.h>
 #include <sys/select.h>
 

common/hardware/libhardware/libsensors/aw_sensors/SensorBase.cpp

@@ -19,6 +19,7 @@
 #include <math.h>
 #include <poll.h>
 #include <unistd.h>
+#include <string.h>
 #include <dirent.h>
 #include <sys/select.h>
 #include <stdlib.h>
@@ -187,6 +188,3 @@ int SensorBase::openInput(const char* inputName) {
 int SensorBase::readEvents(sensors_event_t* data, int count) {
   	return 0;
 }
-
-
-

common/hardware/libhardware/libsensors/aw_sensors/TempSensor.cpp

@@ -21,6 +21,7 @@
 #include <stdlib.h>
 #include <poll.h>
 #include <unistd.h>
+#include <memory.h>
 #include <dirent.h>
 #include <sys/select.h>
 #include <dlfcn.h>
@@ -156,4 +157,3 @@ void TempSensor::processEvent(int code, int value)
 
 
 /*****************************************************************************/
-

common/overlay/frameworks/base/core/res/res/values/custom.xml

@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-
-    <!-- packages who's name in the array will not be killed by -->
-    <string-array name="background_services_whitelist">
-        <item>android</item>
-        <item>com.android</item>
-        <item>com.google</item>
-        <item>com.softwinner</item>
-        <item>google</item>
-        <item>com.sohu.inputmethod</item>
-        <item>com.baidu.input</item>
-        <item>com.iflytek.inputmethod</item>
-        <item>com.tencent.qqpinyin</item>
-        <item>com.komoxo.octopusime</item>
-        <item>com.ting.mp3.android</item>
-        <item>com.kugou.player</item>
-        <item>cn.kuwo.player</item>
-        <item>com.ting.mp3</item>
-        <item>com.netease.cloudmusic</item>
-        <item>fm.xiami.bmamba</item>
-        <item>com.tencent.qqmusic</item>
-        <item>com.iflytek.ringdiy</item>
-        <item>com.duomi.android</item>
-        <item>com.tencent.mobileqq</item>
-        <item>com.tencent.mm</item>
-        <item>fm.qingting.qtradio</item>
-        <item>intelligent.voice</item>
-        <item>com.douban.radio</item>
-        <item>InternetRadio</item>
-        <item>com.itings.myradio</item>
-        <item>com.ximalaya.ting.android</item>
-    </string-array>
-</resources>

common/overlay/frameworks/base/packages/PrintSpooler/res/values-be/arrays.xml

@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<resources>
-
-    <string-array name="pdf_printer_media_sizes" translatable="false">
-        <item>NA_LETTER</item>
-        <item>NA_GOVT_LETTER</item>
-        <item>NA_LEGAL</item>
-        <item>NA_JUNIOR_LEGAL</item>
-        <item>NA_LEDGER</item>
-        <item>NA_TABLOID</item>
-        <item>NA_INDEX_3X5</item>
-        <item>NA_INDEX_4X6</item>
-        <item>NA_INDEX_5X8</item>
-        <item>NA_MONARCH</item>
-        <item>NA_QUARTO</item>
-        <item>NA_FOOLSCAP</item>
-    </string-array>
-
-</resources>

common/overlay/frameworks/base/packages/PrintSpooler/res/values-zh-rCN/arrays.xml

@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<resources>
-
-    <string-array name="pdf_printer_media_sizes" translatable="false">
-        <item>ROC_8K</item>
-        <item>ROC_16K</item>
-        <item>PRC_1</item>
-        <item>PRC_2</item>
-        <item>PRC_3</item>
-        <item>PRC_4</item>
-        <item>PRC_5</item>
-        <item>PRC_6</item>
-        <item>PRC_7</item>
-        <item>PRC_8</item>
-        <item>PRC_9</item>
-        <item>PRC_10</item>
-        <item>PRC_16K</item>
-        <item>OM_PA_KAI</item>
-        <item>OM_DAI_PA_KAI</item>
-        <item>OM_JUURO_KU_KAI</item>
-    </string-array>
-
-</resources>