From 18a130e98a654b99057d974f563a645dbb96010c Mon Sep 17 00:00:00 2001 From: Bruce Beare Date: Fri, 18 Feb 2011 15:06:20 -0800 Subject: [PATCH 1/2] x86: qemu emulator is the default build target Change-Id: I1fc3cb491d593d3e28f90278cfc8de5d77852932 Signed-off-by: Bruce Beare Signed-off-by: Jun Nakajima --- core/Makefile | 6 +- core/tasks/sdk-addon.mk | 8 +- target/board/generic_x86/AndroidBoard.mk | 10 +- target/board/generic_x86/BoardConfig.mk | 45 +-- target/board/generic_x86/README.txt | 33 +- target/board/generic_x86/device.mk | 26 ++ target/board/generic_x86/disk_layout.conf | 54 --- target/board/generic_x86/init.rc | 427 ---------------------- target/board/generic_x86/system.prop | 6 + target/product/full_x86.mk | 17 +- target/product/generic_x86.mk | 44 +-- 11 files changed, 90 insertions(+), 586 deletions(-) create mode 100644 target/board/generic_x86/device.mk delete mode 100644 target/board/generic_x86/disk_layout.conf delete mode 100644 target/board/generic_x86/init.rc create mode 100644 target/board/generic_x86/system.prop diff --git a/core/Makefile b/core/Makefile index ec3cc0299..ad58b9216 100644 --- a/core/Makefile +++ b/core/Makefile @@ -1252,7 +1252,7 @@ ifneq ($(TARGET_SIMULATOR),true) INTERNAL_EMULATOR_PACKAGE_FILES += \ $(HOST_OUT_EXECUTABLES)/emulator$(HOST_EXECUTABLE_SUFFIX) \ - prebuilt/android-arm/kernel/kernel-qemu \ + prebuilt/android-$(TARGET_ARCH)/kernel/kernel-qemu \ $(INSTALLED_RAMDISK_TARGET) \ $(INSTALLED_SYSTEMIMAGE) \ $(INSTALLED_USERDATAIMAGE_TARGET) @@ -1377,9 +1377,11 @@ $(INTERNAL_SDK_TARGET): $(deps) -I $(TARGET_COMMON_OUT_ROOT) \ -v "PLATFORM_NAME=android-$(PLATFORM_VERSION)" \ -v "OUT_DIR=$(OUT_DIR)" \ + -v "TARGET_ARCH=$(TARGET_ARCH)" \ + -v "TARGET_CPU_ABI=$(TARGET_CPU_ABI)" \ -o $(PRIVATE_DIR) && \ cp -f $(target_notice_file_txt) \ - $(PRIVATE_DIR)/platforms/android-$(PLATFORM_VERSION)/images/NOTICE.txt && \ + $(PRIVATE_DIR)/platforms/android-$(PLATFORM_VERSION)/images/$(TARGET_CPU_ABI)/NOTICE.txt && \ cp -f $(tools_notice_file_txt) $(PRIVATE_DIR)/tools/NOTICE.txt && \ if [ -f $(PRIVATE_DIR)/platform-tools/llvm-rs-cc ]; then \ $(HOST_STRIP_SDK_LLVM) $(PRIVATE_DIR)/platform-tools/llvm-rs-cc; \ diff --git a/core/tasks/sdk-addon.mk b/core/tasks/sdk-addon.mk index 91333128a..86d847191 100644 --- a/core/tasks/sdk-addon.mk +++ b/core/tasks/sdk-addon.mk @@ -55,10 +55,10 @@ files_to_copy += $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SDK_ADDON_COPY_FILES) # All SDK add-ons have these files files_to_copy += \ - $(BUILT_SYSTEMIMAGE):images/system.img \ - $(BUILT_USERDATAIMAGE_TARGET):images/userdata.img \ - $(BUILT_RAMDISK_TARGET):images/ramdisk.img \ - $(target_notice_file_txt):images/NOTICE.txt + $(BUILT_SYSTEMIMAGE):images/$(TARGET_CPU_ABI)/system.img \ + $(BUILT_USERDATAIMAGE_TARGET):images/$(TARGET_CPU_ABI)/userdata.img \ + $(BUILT_RAMDISK_TARGET):images/$(TARGET_CPU_ABI)/ramdisk.img \ + $(target_notice_file_txt):images/$(TARGET_CPU_ABI)/NOTICE.txt # Generate rules to copy the requested files $(foreach cf,$(files_to_copy), \ diff --git a/target/board/generic_x86/AndroidBoard.mk b/target/board/generic_x86/AndroidBoard.mk index 01ca1b77f..8fb68f80a 100644 --- a/target/board/generic_x86/AndroidBoard.mk +++ b/target/board/generic_x86/AndroidBoard.mk @@ -1,11 +1,3 @@ LOCAL_PATH := $(call my-dir) -ifeq ($(TARGET_PREBUILT_KERNEL),) -LOCAL_KERNEL := prebuilt/android-x86/kernel/kernel -else -LOCAL_KERNEL := $(TARGET_PREBUILT_KERNEL) -endif - -PRODUCT_COPY_FILES += \ - $(LOCAL_KERNEL):kernel \ - $(LOCAL_PATH)/init.rc:root/init.rc +# diff --git a/target/board/generic_x86/BoardConfig.mk b/target/board/generic_x86/BoardConfig.mk index 2268d4100..1bad20d5b 100644 --- a/target/board/generic_x86/BoardConfig.mk +++ b/target/board/generic_x86/BoardConfig.mk @@ -1,30 +1,23 @@ -TARGET_ARCH=x86 -DISABLE_DEXPREOPT := true -TARGET_COMPRESS_MODULE_SYMBOLS := false -TARGET_PRELINK_MODULE := false -TARGET_NO_RECOVERY := true -TARGET_HARDWARE_3D := false -BOARD_USES_GENERIC_AUDIO := true -USE_CAMERA_STUB := true -TARGET_PROVIDES_INIT_RC := true -USE_CUSTOM_RUNTIME_HEAP_MAX := "32M" +# config.mk +# +# Product-specific compile-time definitions. +# + +# The generic product target doesn't have any hardware-specific pieces. +TARGET_NO_BOOTLOADER := true +TARGET_NO_KERNEL := true TARGET_CPU_ABI := x86 -TARGET_USERIMAGES_USE_EXT4 := true -TARGET_BOOTIMAGE_USE_EXT2 := true +TARGET_ARCH := x86 +TARGET_ARCH_VARIANT := x86-atom +TARGET_PRELINK_MODULE := false -# For VirtualBox and likely other emulators -BOARD_INSTALLER_CMDLINE := init=/init console=ttyS0 console=tty0 androidboot.hardware=generic_x86 vga=788 androidboot.console=tty0 verbose -BOARD_KERNEL_CMDLINE := init=/init console=tty0 console=ttyS0 androidboot.hardware=generic_x86 vga=788 androidboot.console=tty0 verbose -TARGET_USE_DISKINSTALLER := true -TARGET_DISK_LAYOUT_CONFIG := build/target/board/generic_x86/disk_layout.conf -BOARD_BOOTIMAGE_MAX_SIZE := 8388608 -BOARD_SYSLOADER_MAX_SIZE := 7340032 -BOARD_FLASH_BLOCK_SIZE := 512 -BOARD_USERDATAIMAGE_PARTITION_SIZE := 50M -BOARD_INSTALLERIMAGE_PARTITION_SIZE := 500M -TARGET_USERIMAGES_SPARSE_EXT_DISABLED := true +# The IA emulator (qemu) uses the Goldfish devices +HAVE_HTC_AUDIO_DRIVER := true +BOARD_USES_GENERIC_AUDIO := true +# no hardware camera +USE_CAMERA_STUB := true + +# Set /system/bin/sh to mksh, not ash, to test the transition. +TARGET_SHELL := mksh -# The eth0 device should be started with dhcp on boot. -# Useful for emulators that don't provide a wifi connection. -NET_ETH0_STARTONBOOT := true diff --git a/target/board/generic_x86/README.txt b/target/board/generic_x86/README.txt index 585a373fa..938d982e9 100644 --- a/target/board/generic_x86/README.txt +++ b/target/board/generic_x86/README.txt @@ -1,29 +1,8 @@ -The generic_x86 board target provides basic services on very basic -hardware (really for an emulation). To build with generic_x86, you will -need an appropriate kernel for your emulation (or device). +The "generic_x86" product defines a non-hardware-specific IA target +without a kernel or bootloader. -A1. Create a new top level directory and pull the AOSP repository - mkdir $HOME/AOSP - cd $HOME/AOSP - repo init -u git://android.git.kernel.org/platform/manifest.git - repo sync - -A2. Copy in the kernel - cd $HOME/AOSP - cp ~/bzImage.your_device $HOME/AOSP/prebuilt/android-x86/kernel/kernel - -A3. Build - cd $HOME/AOSP - source build/envsetup.sh - lunch generic_x86-eng - make -j8 - -The build will generate some image files whose format may or may not be correct for your -device. You can build an installer image disk for the VirtualBox emulator using the command: - -A4. Build a VirtualBox installer image - cd $HOME/AOSP - source build/envsetup.sh - lunch generic_x86-eng - make -j8 installer_vdi +It can be used to build the entire user-level system, and +will work with the IA version of the emulator, +It is not a product "base class"; no other products inherit +from it or use it in any way. diff --git a/target/board/generic_x86/device.mk b/target/board/generic_x86/device.mk new file mode 100644 index 000000000..0b4dc271c --- /dev/null +++ b/target/board/generic_x86/device.mk @@ -0,0 +1,26 @@ +# +# Copyright (C) 2009 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. +# + +# This is a build configuration for the product aspects that +# are specific to the emulator. + +PRODUCT_PROPERTY_OVERRIDES := \ + ro.ril.hsxpa=1 \ + ro.ril.gprsclass=10 + +PRODUCT_COPY_FILES := \ + development/data/etc/apns-conf.xml:system/etc/apns-conf.xml \ + development/data/etc/vold.conf:system/etc/vold.conf diff --git a/target/board/generic_x86/disk_layout.conf b/target/board/generic_x86/disk_layout.conf deleted file mode 100644 index 7b073eef5..000000000 --- a/target/board/generic_x86/disk_layout.conf +++ /dev/null @@ -1,54 +0,0 @@ -device { - path /dev/block/sda - - scheme mbr - - # bytes in a disk sector (== 1 LBA), must be a power of 2! - sector_size 512 - - # What LBA should the partitions start at? - start_lba 2048 - - # Autodetect disk size if == 0 - num_lba 0 - - partitions { - sysloader { - active y - type linux - len 7M - } - - recovery { - active y - type linux - len 16M - } - - boot { - active y - type linux - len 8M - } - - cache { - type linux - len 512M - } - - system { - type linux - len 512M - } - - third_party { - type linux - len 512M - } - - data { - type linux - len -1 - } - } -} diff --git a/target/board/generic_x86/init.rc b/target/board/generic_x86/init.rc deleted file mode 100644 index 8f6be285a..000000000 --- a/target/board/generic_x86/init.rc +++ /dev/null @@ -1,427 +0,0 @@ -on early-init - start ueventd - -on init - -sysclktz 0 - -loglevel 3 - -# setup the global environment - export PATH /sbin:/vendor/bin:/system/sbin:/system/bin:/system/xbin - export LD_LIBRARY_PATH /vendor/lib:/system/lib - export ANDROID_BOOTLOGO 1 - export ANDROID_ROOT /system - export ANDROID_ASSETS /system/app - export ANDROID_DATA /data - export EXTERNAL_STORAGE /mnt/sdcard - export ASEC_MOUNTPOINT /mnt/asec - export LOOP_MOUNTPOINT /mnt/obb - export BOOTCLASSPATH /system/framework/core.jar:/system/framework/bouncycastle.jar:/system/framework/ext.jar:/system/framework/framework.jar:/system/framework/android.policy.jar:/system/framework/services.jar:/system/framework/core-junit.jar - -# Backward compatibility - symlink /system/etc /etc - symlink /sys/kernel/debug /d - -# Right now vendor lives on the same filesystem as system, -# but someday that may change. - symlink /system/vendor /vendor - -# create mountpoints - mkdir /mnt 0775 root system - mkdir /mnt/sdcard 0000 system system - -# Create cgroup mount point for cpu accounting - mkdir /acct - mount cgroup none /acct cpuacct - mkdir /acct/uid - -# Backwards Compat - XXX: Going away in G* - symlink /mnt/sdcard /sdcard - - mkdir /system - mkdir /data 0771 system system - mkdir /cache 0770 system cache - mkdir /config 0500 root root - - # Directory for putting things only root should see. - mkdir /mnt/secure 0700 root root - - # Directory for staging bindmounts - mkdir /mnt/secure/staging 0700 root root - - # Directory-target for where the secure container - # imagefile directory will be bind-mounted - mkdir /mnt/secure/asec 0700 root root - - # Secure container public mount points. - mkdir /mnt/asec 0700 root system - mount tmpfs tmpfs /mnt/asec mode=0755,gid=1000 - - # Filesystem image public mount points. - mkdir /mnt/obb 0700 root system - mount tmpfs tmpfs /mnt/obb mode=0755,gid=1000 - - write /proc/sys/kernel/panic_on_oops 1 - write /proc/sys/kernel/hung_task_timeout_secs 0 - write /proc/cpu/alignment 4 - write /proc/sys/kernel/sched_latency_ns 10000000 - write /proc/sys/kernel/sched_wakeup_granularity_ns 2000000 - write /proc/sys/kernel/sched_compat_yield 1 - write /proc/sys/kernel/sched_child_runs_first 0 - -# Create cgroup mount points for process groups - mkdir /dev/cpuctl - mount cgroup none /dev/cpuctl cpu - chown system system /dev/cpuctl - chown system system /dev/cpuctl/tasks - chmod 0777 /dev/cpuctl/tasks - write /dev/cpuctl/cpu.shares 1024 - - mkdir /dev/cpuctl/fg_boost - chown system system /dev/cpuctl/fg_boost/tasks - chmod 0777 /dev/cpuctl/fg_boost/tasks - write /dev/cpuctl/fg_boost/cpu.shares 1024 - - mkdir /dev/cpuctl/bg_non_interactive - chown system system /dev/cpuctl/bg_non_interactive/tasks - chmod 0777 /dev/cpuctl/bg_non_interactive/tasks - # 5.0 % - write /dev/cpuctl/bg_non_interactive/cpu.shares 52 - -on fs -# mount mtd partitions - mount ext4 /dev/block/sda6 /system rw - mkdir /system/vendor - mount ext4 /dev/block/sda8 /data nosuid nodev - mount ext4 /dev/block/sda7 /cache nosuid nodev - -on post-fs - # once everything is setup, no need to modify / - mount rootfs rootfs / ro remount - - # We chown/chmod /data again so because mount is run as root + defaults - chown system system /data - chmod 0771 /data - - # Create dump dir and collect dumps. - # Do this before we mount cache so eventually we can use cache for - # storing dumps on platforms which do not have a dedicated dump partition. - - mkdir /data/dontpanic - chown root log /data/dontpanic - chmod 0750 /data/dontpanic - - # Collect apanic data, free resources and re-arm trigger - copy /proc/apanic_console /data/dontpanic/apanic_console - chown root log /data/dontpanic/apanic_console - chmod 0640 /data/dontpanic/apanic_console - - copy /proc/apanic_threads /data/dontpanic/apanic_threads - chown root log /data/dontpanic/apanic_threads - chmod 0640 /data/dontpanic/apanic_threads - - write /proc/apanic_console 1 - - # Same reason as /data above - chown system cache /cache - chmod 0770 /cache - - # This may have been created by the recovery system with odd permissions - chown system cache /cache/recovery - chmod 0770 /cache/recovery - - #change permissions on vmallocinfo so we can grab it from bugreports - chown root log /proc/vmallocinfo - chmod 0440 /proc/vmallocinfo - - #change permissions on kmsg & sysrq-trigger so bugreports can grab kthread stacks - chown root system /proc/kmsg - chmod 0440 /proc/kmsg - chown root system /proc/sysrq-trigger - chmod 0220 /proc/sysrq-trigger - -# create basic filesystem structure - mkdir /data/misc 01771 system misc - mkdir /data/misc/bluetoothd 0770 bluetooth bluetooth - mkdir /data/misc/bluetooth 0770 system system - mkdir /data/misc/keystore 0700 keystore keystore - mkdir /data/misc/vpn 0770 system system - mkdir /data/misc/systemkeys 0700 system system - mkdir /data/misc/vpn/profiles 0770 system system - # give system access to wpa_supplicant.conf for backup and restore - mkdir /data/misc/wifi 0770 wifi wifi - chmod 0770 /data/misc/wifi - chmod 0660 /data/misc/wifi/wpa_supplicant.conf - mkdir /data/local 0771 shell shell - mkdir /data/local/tmp 0771 shell shell - mkdir /data/data 0771 system system - mkdir /data/app-private 0771 system system - mkdir /data/app 0771 system system - mkdir /data/property 0700 root root - - # create dalvik-cache and double-check the perms - mkdir /data/dalvik-cache 0771 system system - chown system system /data/dalvik-cache - chmod 0771 /data/dalvik-cache - - # create the lost+found directories, so as to enforce our permissions - mkdir /data/lost+found 0770 - mkdir /cache/lost+found 0770 - - # double check the perms, in case lost+found already exists, and set owner - chown root root /data/lost+found - chmod 0770 /data/lost+found - chown root root /cache/lost+found - chmod 0770 /cache/lost+found - - # create data/drm directory - mkdir /data/drm 0774 drm drm - chown drm drm /data/drm - chmod 0774 /data/drm - -on boot -# basic network init - ifup lo - hostname localhost - domainname localdomain - -# set RLIMIT_NICE to allow priorities from 19 to -20 - setrlimit 13 40 40 - -# Define the oom_adj values for the classes of processes that can be -# killed by the kernel. These are used in ActivityManagerService. - setprop ro.FOREGROUND_APP_ADJ 0 - setprop ro.VISIBLE_APP_ADJ 1 - setprop ro.PERCEPTIBLE_APP_ADJ 2 - setprop ro.HEAVY_WEIGHT_APP_ADJ 3 - setprop ro.SECONDARY_SERVER_ADJ 4 - setprop ro.BACKUP_APP_ADJ 5 - setprop ro.HOME_APP_ADJ 6 - setprop ro.HIDDEN_APP_MIN_ADJ 7 - setprop ro.EMPTY_APP_ADJ 15 - -# Define the memory thresholds at which the above process classes will -# be killed. These numbers are in pages (4k). - setprop ro.FOREGROUND_APP_MEM 2048 - setprop ro.VISIBLE_APP_MEM 3072 - setprop ro.PERCEPTIBLE_APP_MEM 4096 - setprop ro.HEAVY_WEIGHT_APP_MEM 4096 - setprop ro.SECONDARY_SERVER_MEM 6144 - setprop ro.BACKUP_APP_MEM 6144 - setprop ro.HOME_APP_MEM 6144 - setprop ro.HIDDEN_APP_MEM 7168 - setprop ro.EMPTY_APP_MEM 8192 - -# Write value must be consistent with the above properties. -# Note that the driver only supports 6 slots, so we have combined some of -# the classes into the same memory level; the associated processes of higher -# classes will still be killed first. - write /sys/module/lowmemorykiller/parameters/adj 0,1,2,4,7,15 - - write /proc/sys/vm/overcommit_memory 1 - write /proc/sys/vm/min_free_order_shift 4 - write /sys/module/lowmemorykiller/parameters/minfree 2048,3072,4096,6144,7168,8192 - - # Set init its forked children's oom_adj. - write /proc/1/oom_adj -16 - - # Tweak background writeout - write /proc/sys/vm/dirty_expire_centisecs 200 - write /proc/sys/vm/dirty_background_ratio 5 - - # Permissions for System Server and daemons. - chown radio system /sys/android_power/state - chown radio system /sys/android_power/request_state - 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 - chown system system /sys/class/leds/button-backlight/brightness - chown system system /sys/class/leds/jogball-backlight/brightness - chown system system /sys/class/leds/red/brightness - chown system system /sys/class/leds/green/brightness - chown system system /sys/class/leds/blue/brightness - chown system system /sys/class/leds/red/device/grpfreq - chown system system /sys/class/leds/red/device/grppwm - chown system system /sys/class/leds/red/device/blink - chown system system /sys/class/leds/red/brightness - chown system system /sys/class/leds/green/brightness - chown system system /sys/class/leds/blue/brightness - chown system system /sys/class/leds/red/device/grpfreq - chown system system /sys/class/leds/red/device/grppwm - chown system system /sys/class/leds/red/device/blink - chown system system /sys/class/timed_output/vibrator/enable - chown system system /sys/module/sco/parameters/disable_esco - chown system system /sys/kernel/ipv4/tcp_wmem_min - chown system system /sys/kernel/ipv4/tcp_wmem_def - chown system system /sys/kernel/ipv4/tcp_wmem_max - chown system system /sys/kernel/ipv4/tcp_rmem_min - chown system system /sys/kernel/ipv4/tcp_rmem_def - chown system system /sys/kernel/ipv4/tcp_rmem_max - chown root radio /proc/cmdline - -# Define TCP buffer sizes for various networks -# ReadMin, ReadInitial, ReadMax, WriteMin, WriteInitial, WriteMax, - setprop net.tcp.buffersize.default 4096,87380,110208,4096,16384,110208 - setprop net.tcp.buffersize.wifi 4095,87380,110208,4096,16384,110208 - setprop net.tcp.buffersize.umts 4094,87380,110208,4096,16384,110208 - setprop net.tcp.buffersize.edge 4093,26280,35040,4096,16384,35040 - setprop net.tcp.buffersize.gprs 4092,8760,11680,4096,8760,11680 - - class_start default - -## Daemon processes to be run by init. -## -service ueventd /sbin/ueventd - critical - -service console /system/bin/sh - console - disabled - user shell - group log - -on property:ro.secure=0 - start console - -# Enable networking so that adb can connect -service netcfg /system/bin/netcfg eth0 dhcp - setprop property:ro.kernel.qemu 1 - oneshot - -# adbd is controlled by the persist.service.adb.enable system property -service adbd /sbin/adbd - disabled - -# adbd on at boot in emulator -on property:ro.kernel.qemu=1 - start adbd - -on property:persist.service.adb.enable=1 - start adbd - -on property:persist.service.adb.enable=0 - stop adbd - -service servicemanager /system/bin/servicemanager - user system - critical - onrestart restart zygote - onrestart restart media - -service vold /system/bin/vold - socket vold stream 0660 root mount - ioprio be 2 - -service netd /system/bin/netd - socket netd stream 0660 root system - socket dnsproxyd stream 0660 root inet - -service debuggerd /system/bin/debuggerd - -service ril-daemon /system/bin/rild - socket rild stream 660 root radio - socket rild-debug stream 660 radio system - user root - group radio cache inet misc audio sdcard_rw - -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 - onrestart restart media - onrestart restart netd - -service drm /system/bin/drmserver - user drm - group system root inet - -service drmio /system/bin/drmioserver - user drmio - -service media /system/bin/mediaserver - user media - group system audio camera graphics inet net_bt net_bt_admin net_raw - ioprio rt 4 - -service bootanim /system/bin/bootanimation - user graphics - group graphics - disabled - oneshot - -service dbus /system/bin/dbus-daemon --system --nofork - socket dbus stream 660 bluetooth bluetooth - user bluetooth - group bluetooth net_bt_admin - -service bluetoothd /system/bin/bluetoothd -n - socket bluetooth stream 660 bluetooth bluetooth - socket dbus_bluetooth stream 660 bluetooth bluetooth - # init.rc does not yet support applying capabilities, so run as root and - # let bluetoothd drop uid to bluetooth with the right linux capabilities - group bluetooth net_bt_admin misc - disabled - -service hfag /system/bin/sdptool add --channel=10 HFAG - user bluetooth - group bluetooth net_bt_admin - disabled - oneshot - -service hsag /system/bin/sdptool add --channel=11 HSAG - user bluetooth - group bluetooth net_bt_admin - disabled - oneshot - -service opush /system/bin/sdptool add --channel=12 OPUSH - user bluetooth - group bluetooth net_bt_admin - disabled - oneshot - -service pbap /system/bin/sdptool add --channel=19 PBAP - user bluetooth - group bluetooth net_bt_admin - disabled - oneshot - -service installd /system/bin/installd - socket installd stream 600 system system - -service flash_recovery /system/etc/install-recovery.sh - oneshot - -service racoon /system/bin/racoon - socket racoon stream 600 system system - # racoon will setuid to vpn after getting necessary resources. - group net_admin - disabled - oneshot - -service mtpd /system/bin/mtpd - socket mtpd stream 600 system system - user vpn - group vpn net_admin net_raw - disabled - oneshot - -service keystore /system/bin/keystore /data/misc/keystore - user keystore - group keystore - socket keystore stream 666 - -service dumpstate /system/bin/dumpstate -s - socket dumpstate stream 0660 shell log - disabled - oneshot diff --git a/target/board/generic_x86/system.prop b/target/board/generic_x86/system.prop new file mode 100644 index 000000000..137a0f9b1 --- /dev/null +++ b/target/board/generic_x86/system.prop @@ -0,0 +1,6 @@ +# +# system.prop for generic sdk +# + +rild.libpath=/system/lib/libreference-ril.so +rild.libargs=-d /dev/ttyS0 diff --git a/target/product/full_x86.mk b/target/product/full_x86.mk index affdc1391..e33ef142e 100644 --- a/target/product/full_x86.mk +++ b/target/product/full_x86.mk @@ -16,19 +16,14 @@ # This is a build configuration for a full-featured build of the # Open-Source part of the tree. It's geared toward a US-centric -# x86 build, but all those aspects can be overridden -# in inherited configurations. +# build quite specifically for the emulator, and might not be +# entirely appropriate to inherit from for on-device configurations. -# If running on an emulator or some other device that has a LAN connection -# that isn't a wifi connection. This will instruct init.rc to enable the -# network connection so that you can use it with ADB -ifdef NET_ETH0_STARTONBOOT - PRODUCT_PROPERTY_OVERRIDES += net.eth0.startonboot=1 -endif - -$(call inherit-product, build/target/product/full.mk) +$(call inherit-product, $(SRC_TARGET_DIR)/product/full_base.mk) +$(call inherit-product, $(SRC_TARGET_DIR)/board/generic/device.mk) # Overrides PRODUCT_NAME := full_x86 PRODUCT_DEVICE := generic_x86 -PRODUCT_MODEL := Full Android x86 +PRODUCT_BRAND := Android +PRODUCT_MODEL := Full Android on x86 Emulator diff --git a/target/product/generic_x86.mk b/target/product/generic_x86.mk index 345a79ac3..7e77a273a 100644 --- a/target/product/generic_x86.mk +++ b/target/product/generic_x86.mk @@ -1,34 +1,26 @@ +# +# Copyright (C) 2007 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. +# + # This is a generic product that isn't specialized for a specific device. -# It includes the base Android platform. If you need Google-specific features, -# you should derive from generic_with_google.mk - -PRODUCT_PACKAGES := \ - DeskClock \ - AlarmProvider \ - Calendar \ - Camera \ - DrmProvider \ - LatinIME \ - Mms \ - Music \ - Settings \ - Sync \ - Updater \ - CalendarProvider \ - SubscribedFeedsProvider \ - SyncProvider +# It includes the base Android platform. +$(call inherit-product, $(SRC_TARGET_DIR)/product/generic.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/core.mk) # Overrides PRODUCT_BRAND := generic_x86 PRODUCT_DEVICE := generic_x86 PRODUCT_NAME := generic_x86 -PRODUCT_POLICY := android.policy_phone - -# If running on an emulator or some other device that has a LAN connection -# that isn't a wifi connection. This will instruct init.rc to enable the -# network connection so that you can use it with ADB -ifdef NET_ETH0_STARTONBOOT - PRODUCT_PROPERTY_OVERRIDES += net.eth0.startonboot=1 -endif From 2e8283d9bcb3a4d92868b36f523e8dce2a851ddc Mon Sep 17 00:00:00 2001 From: Bruce Beare Date: Tue, 1 Feb 2011 08:00:09 -0800 Subject: [PATCH 2/2] x86: the -mbionic flag is needed for IA builds. Change-Id: I00c75f37d7ea46b9f8ad3d7b2ff7094477ff0916 Signed-off-by: Bruce Beare --- core/combo/TARGET_linux-x86.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/core/combo/TARGET_linux-x86.mk b/core/combo/TARGET_linux-x86.mk index 6b4083d1c..449af83ac 100644 --- a/core/combo/TARGET_linux-x86.mk +++ b/core/combo/TARGET_linux-x86.mk @@ -89,6 +89,7 @@ else TARGET_GLOBAL_CFLAGS += -march=i686 endif +TARGET_GLOBAL_CFLAGS += -mbionic TARGET_GLOBAL_CFLAGS += -D__ANDROID__ TARGET_GLOBAL_LDFLAGS += -m32