Rename eee_701 to eeepc.

Other changes from patch-hosting-for-android-x86-support:
 * move Android.mk to AndroidBoard.mk
 * fix the init.rc to avoid runtime crash.
 * enabled adbd and vold by default

diff --git a/Android.mk b/AndroidBoard.mk
similarity index 89%
rename from Android.mk
rename to AndroidBoard.mk
index 188774f..301d8ff 100644 (file)
--- a/Android.mk
+++ b/AndroidBoard.mk
@@ -27,7 +27,6 @@ $(file): $(TARGET_PREBUILT_KERNEL) | $(ACP)
 #-include vendor/intel/g945/Android.mk
 
 ################### TEMP HACK!?!
-LOCAL_PATH := vendor/asus/eee_701
 include $(CLEAR_VARS)
 
 kernel_modules := \
@@ -57,7 +56,6 @@ ALL_PREBUILT += $(installed_kernel_modules)
 # Lets install our own init.rc files :)
 # We will also make the ramdisk depend on it so that it's always pulled in.
 
-LOCAL_PATH := vendor/asus/eee_701
 include $(CLEAR_VARS)
 
 target_init_rc_file := $(TARGET_ROOT_OUT)/init.rc
@@ -65,16 +63,16 @@ $(target_init_rc_file) : $(LOCAL_PATH)/init.rc | $(ACP)
        $(transform-prebuilt-to-target)
 ALL_PREBUILT += $(target_init_rc_file)
 
-target_hw_init_rc_file := $(TARGET_ROOT_OUT)/init.eee_701.rc
-$(target_hw_init_rc_file) : $(LOCAL_PATH)/init.eee_701.rc | $(ACP)
+target_hw_init_rc_file := $(TARGET_ROOT_OUT)/init.eeepc.rc
+$(target_hw_init_rc_file) : $(LOCAL_PATH)/init.eeepc.rc | $(ACP)
        $(transform-prebuilt-to-target)
 ALL_PREBUILT += $(target_hw_init_rc_file)
 
 $(INSTALLED_RAMDISK_TARGET): $(target_init_rc_file) $(target_hw_init_rc_file)
 
 # and our initialization script
-file := $(TARGET_OUT)/etc/init.eee_701.sh
-$(file) : $(LOCAL_PATH)/init.eee_701.sh | $(ACP)
+file := $(TARGET_OUT)/etc/init.eeepc.sh
+$(file) : $(LOCAL_PATH)/init.eeepc.sh | $(ACP)
        $(transform-prebuilt-to-target)
 ALL_PREBUILT += $(file)
 

diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index 766dd1b..6cd18df 100644 (file)
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -26,4 +26,4 @@
 #
 
 PRODUCT_MAKEFILES := \
-    $(LOCAL_DIR)/eee_701.mk
+    $(LOCAL_DIR)/eeepc.mk

diff --git a/BoardConfig.mk b/BoardConfig.mk
index 54b0d4f..d39af42 100644 (file)
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -23,9 +23,10 @@ TARGET_USERIMAGES_USE_EXT2 := true
 TARGET_BOOTIMAGE_USE_EXT2 := true
 TARGET_USE_DISKINSTALLER := true
 
-TARGET_DISK_LAYOUT_CONFIG := vendor/asus/eee_701/disk_layout.conf
+LOCAL_PATH := $(call my-dir)
+TARGET_DISK_LAYOUT_CONFIG := $(LOCAL_PATH)/disk_layout.conf
 
-BOARD_KERNEL_CMDLINE := console=tty0 console=ttyS1,115200n8 console=tty0 androidboot.hardware=eee_701
+BOARD_KERNEL_CMDLINE := console=tty0 console=ttyS1,115200n8 androidboot.hardware=eeepc
 
 
 BOARD_BOOTIMAGE_MAX_SIZE := 8388608

diff --git a/eee_701.mk b/eee_701.mk
deleted file mode 100644 (file)
index 508108c..0000000
--- a/eee_701.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# TODO: Need to setup a proper inheritance tree for this class of
-# products...
-#
-# For now, reuse the generic (phone) infrastructure.
-#
-
-$(call inherit-product, $(SRC_TARGET_DIR)/product/generic_with_google.mk)
-
-PRODUCT_NAME := eee_701
-PRODUCT_DEVICE := eee_701
-PRODUCT_POLICY := android.policy_mid
-PRODUCT_PROPERTY_OVERRIDES += \
-        ro.com.android.dataroaming=true
-

diff --git a/eeepc.mk b/eeepc.mk
new file mode 100644 (file)
index 0000000..c387938
--- /dev/null
+++ b/eeepc.mk
@@ -0,0 +1,18 @@
+# TODO: Need to setup a proper inheritance tree for this class of
+# products...
+#
+# For now, reuse the generic (phone) infrastructure.
+#
+
+$(call inherit-product, $(SRC_TARGET_DIR)/product/generic.mk)
+
+PRODUCT_NAME := eeepc
+PRODUCT_DEVICE := eeepc
+PRODUCT_POLICY := android.policy_mid
+PRODUCT_PROPERTY_OVERRIDES += \
+       ro.com.android.dataroaming=true
+
+ifeq ($(TARGET_PRODUCT),$(PRODUCT_NAME))
+TARGET_ARCH := x86
+DISABLE_DEXPREOPT := true
+endif

diff --git a/init.eee_701.rc b/init.eeepc.rc
similarity index 78%
rename from init.eee_701.rc
rename to init.eeepc.rc
index 9b8efc3..eea964a 100644 (file)
--- a/init.eee_701.rc
+++ b/init.eeepc.rc
@@ -6,5 +6,5 @@ on boot
     setprop status.battery.level_raw  50
     setprop status.battery.level_scale 9
 
-service eee_701-setup /system/bin/sh /system/etc/init.eee_701.sh
+service eeepc-setup /system/bin/sh /system/etc/init.eeepc.sh
     oneshot

diff --git a/init.eee_701.sh b/init.eeepc.sh
similarity index 100%
rename from init.eee_701.sh
rename to init.eeepc.sh

diff --git a/init.rc b/init.rc
index 00aa93c..4607d75 100644 (file)
--- a/init.rc
+++ b/init.rc
@@ -108,6 +108,7 @@ on boot
     setprop ro.FOREGROUND_APP_ADJ 0
     setprop ro.VISIBLE_APP_ADJ 1
     setprop ro.SECONDARY_SERVER_ADJ 2
+    setprop ro.HOME_APP_ADJ 4
     setprop ro.HIDDEN_APP_MIN_ADJ 7
     setprop ro.CONTENT_PROVIDER_ADJ 14
     setprop ro.EMPTY_APP_ADJ 15
@@ -117,6 +118,7 @@ on boot
     setprop ro.FOREGROUND_APP_MEM 1536
     setprop ro.VISIBLE_APP_MEM 2048
     setprop ro.SECONDARY_SERVER_MEM 4096
+    setprop ro.HOME_APP_MEM 4096
     setprop ro.HIDDEN_APP_MEM 8192
     setprop ro.CONTENT_PROVIDER_MEM 8704
     setprop ro.EMPTY_APP_MEM 16384
@@ -136,6 +138,12 @@ on boot
     chown radio system /sys/android_power/acquire_full_wake_lock
     chown radio system /sys/android_power/acquire_partial_wake_lock
     chown radio system /sys/android_power/release_wake_lock
+    chown radio system /sys/power/state
+    chown radio system /sys/power/wake_lock
+    chown radio system /sys/power/wake_unlock
+    chmod 0660 /sys/power/state
+    chmod 0660 /sys/power/wake_lock
+    chmod 0660 /sys/power/wake_unlock
     chown system system /sys/class/timed_output/vibrator/enable
     chown system system /sys/class/leds/keyboard-backlight/brightness
     chown system system /sys/class/leds/lcd-backlight/brightness
@@ -179,7 +187,6 @@ service console /system/bin/sh
 
 # adbd is controlled by the persist.service.adb.enable system property
 service adbd /sbin/adbd
-    disabled
 
 on property:persist.service.adb.enable=1
     start adbd
@@ -193,12 +200,13 @@ service servicemanager /system/bin/servicemanager
     onrestart restart zygote
     onrestart restart media
 
-service mountd /system/bin/mountd
-    socket mountd stream 0660 root mount
+service vold /system/bin/vold
+    socket vold stream 0660 root mount
 
 service zygote /system/bin/app_process -Xzygote /system/bin --zygote --start-system-server
     socket zygote stream 666
     onrestart write /sys/android_power/request_state wake
+    onrestart write /sys/power/state on
 
 service media /system/bin/mediaserver
     user media

diff --git a/system.prop b/system.prop
index 4d38907..87b002b 100644 (file)
--- a/system.prop
+++ b/system.prop
@@ -1,5 +1,22 @@
-# system.prop for eee_701
+# system.prop for eeepc
 ro.config.sync = yes
 app.setupwizard.disable=1
 keyguard.no_require_sim=1
-# end system.prop for eee_701
+# default the paths and parameters for sys fs
+ro.sys.fs.power_supply.ac=/AC0
+ro.sys.fs.power_supply.bat=/BAT0
+ro.sys.fs.power_supply.ac.feature.online=/online
+ro.sys.fs.power_supply.bat.feature.status=/status
+ro.sys.fs.power_supply.bat.feature.present=/present
+#ro.sys.fs.power_supply.bat.feature.capacity.now=/energy_now
+#ro.sys.fs.power_supply.bat.feature.capacity.full=/energy_full
+ro.sys.fs.power_supply.bat.feature.capacity.now=/charge_now
+ro.sys.fs.power_supply.bat.feature.capacity.full=/charge_full
+ro.sys.fs.power_supply.bat.feature.voltage.now=/voltage_now
+ro.sys.fs.power_supply.bat.feature.voltage.full=/voltage_full
+ro.sys.fs.power_supply.bat.feature.tech=/technology
+ro.power_supply.uevent.name.capacity.now=POWER_SUPPLY_CHARGE_NOW
+ro.power_supply.uevent.name.capacity.full=POWER_SUPPLY_CHARGE_FULL
+#ro.sys.fs.power_supply.bat.features.bat.health is not supported
+#ro.sys.fs.power_supply.bat.features.bat.temperature is not supported
+# end system.prop for eeepc