more fixes

a10-blobs.mk

@@ -81,7 +81,7 @@ PRODUCT_COPY_FILES += \
 	$(DEVICE_PREBUILT)/bin/mount.exfat:system/bin/mount.exfat \
  	$(DEVICE_PREBUILT)/bin/fsck.exfat:system/bin/fsck.exfat \
 	$(DEVICE_PREBUILT)/etc/media_codecs.xml:system/etc/media_codecs.xml \
-	$(DEVICE_PREBUILT)/audio/audio_policy.conf:system/etc/audio_policy.conf \
+	${device_path}/audio/audio_policy.conf:system/etc/audio_policy.conf \
 
 
 # New CM9 backup list system (addon.d)

a10.mk

@@ -15,6 +15,7 @@
 #
 
 PRODUCT_CHARACTERISTICS := tablet
+DEVICE_PACKAGE_OVERLAYS := device/allwinner/a10/overlay
 
 ## (3)  Finally, the least specific parts, i.e. the non-GSM-specific aspects
 PRODUCT_PROPERTY_OVERRIDES += \
@@ -28,8 +29,6 @@ PRODUCT_PROPERTY_OVERRIDES += \
 	net.dns1=8.8.8.8 \
 	net.dns2=8.8.4.4 
 
-DEVICE_PACKAGE_OVERLAYS := device/allwinner/a10/overlay
-
 # Permissions
 PRODUCT_COPY_FILES += \
 	frameworks/native/data/etc/handheld_core_hardware.xml:system/etc/permissions/tablet_core_hardware.xml \

full_a10.mk

@@ -16,7 +16,6 @@
 $(call inherit-product, $(SRC_TARGET_DIR)/product/full_base.mk)
 $(call inherit-product, device/allwinner/a10/a10.mk)
 $(call inherit-product, frameworks/native/build/tablet-dalvik-heap.mk)
-$(call inherit-product-if-exists, vendor/allwinner/a10/a10-vendor.mk)
 
 # Set those variables here to overwrite the inherited values.
 PRODUCT_NAME := full_a10

gralloc/Android.mk

@@ -18,6 +18,12 @@
 
 LOCAL_PATH := $(call my-dir)
 
+$(shell mkdir -p out/target/product/a10/obj/SHARED_LIBRARIES/libMali_intermediates)
+$(shell mkdir -p out/target/product/a10/obj/SHARED_LIBRARIES/libUMP_intermediates)
+$(shell touch out/target/product/a10/obj/SHARED_LIBRARIES/libMali_intermediates/export_includes)
+$(shell touch out/target/product/a10/obj/SHARED_LIBRARIES/libUMP_intermediates/export_includes)
+
+
 # HAL module implemenation, not prelinked and stored in
 # hw/<OVERLAY_HARDWARE_MODULE_ID>.<ro.product.board>.so
 include $(CLEAR_VARS)

libsensors/sensors.cpp

@@ -55,8 +55,8 @@ static const struct sensor_t sSensorList[] = {
 };
 
 
-static int open_sensors(const struct hw_module_t* module, const char* id,
-                        struct hw_device_t** device);
+static int open_sensors(const struct hw_module_t* module, const char* name,
+        struct hw_device_t** device);
 
 
 static int sensors__get_sensors_list(struct sensors_module_t* module,
@@ -241,8 +241,8 @@ static int poll__poll(struct sensors_poll_device_t *dev,
 /*****************************************************************************/
 
 /** Open a new instance of a sensor device using name */
-static int open_sensors(struct hw_module_t* module, const char* id,
-                        struct hw_device_t** device)
+static int open_sensors(const struct hw_module_t* module, const char* name,
+        struct hw_device_t** device)
 {
         int status = -EINVAL;
         sensors_poll_context_t *dev = new sensors_poll_context_t();

rild/rild.c

@@ -148,7 +148,7 @@ int main(int argc, char **argv)
         int           fd = open("/proc/cmdline",O_RDONLY);
 
         if (fd < 0) {
-            LOGD("could not open /proc/cmdline:%s", strerror(errno));
+            ALOGD("could not open /proc/cmdline:%s", strerror(errno));
             goto OpenLib;
         }
 
@@ -157,7 +157,7 @@ int main(int argc, char **argv)
         while (len == -1 && errno == EINTR);
 
         if (len < 0) {
-            LOGD("could not read /proc/cmdline:%s", strerror(errno));
+            ALOGD("could not read /proc/cmdline:%s", strerror(errno));
             close(fd);
             goto OpenLib;
         }
@@ -193,13 +193,13 @@ int main(int argc, char **argv)
                     done = 1;
                     break;
                 }
-                LOGD("could not connect to %s socket: %s",
+                ALOGD("could not connect to %s socket: %s",
                     QEMUD_SOCKET_NAME, strerror(errno));
                 if (--tries == 0)
                     break;
             }
             if (!done) {
-                LOGE("could not connect to %s socket (giving up): %s",
+                ALOGE("could not connect to %s socket (giving up): %s",
                     QEMUD_SOCKET_NAME, strerror(errno));
                 while(1)
                     sleep(0x00ffffff);
@@ -235,7 +235,7 @@ int main(int argc, char **argv)
             hasLibArgs = 1;
             rilLibPath = REFERENCE_RIL_PATH;
 
-            LOGD("overriding with %s %s", arg_overrides[1], arg_overrides[2]);
+            ALOGD("overriding with %s %s", arg_overrides[1], arg_overrides[2]);
         }
     }
 OpenLib:
@@ -246,7 +246,7 @@ int main(int argc, char **argv)
 
     if (dlHandle == NULL) {
         fprintf(stderr, "dlopen failed: %s\n", dlerror());
-        LOGE("dlopen failed: %s\n", dlerror());
+        ALOGE("dlopen failed: %s\n", dlerror());
         exit(-1);
     }
 

updater-script

@@ -7,7 +7,7 @@ run_program("/sbin/mkdir","/tmp/backupdir");
 run_program("/sbin/touch","/tmp/backupdir/force_backuptool");
 set_perm(0, 0, 0777, "/tmp/backuptool.sh");
 run_program("/tmp/backuptool.sh", "backup");
-format("ext4", "EMMC", "/dev/block/nandd", "0");
+format("ext4", "EMMC", "/dev/block/nandd", "0","/system");
 ui_print("Updating SYSTEM...");
 mount("ext4", "EMMC", "/dev/block/nandd", "/system");
 package_extract_dir("system", "/system");