Merge remote-tracking branch 'x86/pie-x86' into q-x86

Conflicts:
	manifest.xml
	treble.mk

diff --git a/BoardConfig.mk b/BoardConfig.mk
index 6b90e21..f0b0a57 100644 (file)
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -11,8 +11,6 @@ BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := device/generic/common/bluetooth
 
 BOARD_USE_LEGACY_UI := true
 
-BOARD_SYSTEMIMAGE_PARTITION_SIZE = $(if $(MKSQUASHFS),0,1610612736)
-
 # customize the malloced address to be 16-byte aligned
 BOARD_MALLOC_ALIGNMENT := 16
 
@@ -91,3 +89,9 @@ BOARD_SEPOLICY_DIRS += device/generic/common/sepolicy/nonplat \
                        system/bt/vendor_libs/linux/sepolicy \
 
 BOARD_PLAT_PRIVATE_SEPOLICY_DIR := device/generic/common/sepolicy/plat_private
+
+BOARD_BUILD_SYSTEM_ROOT_IMAGE := true
+BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE := 33554432
+BOARD_USES_OEMIMAGE := true
+BUILD_BROKEN_USES_NETWORK := true
+USE_XML_AUDIO_POLICY_CONF := 1

diff --git a/OWNERS b/OWNERS
new file mode 100644 (file)
index 0000000..0d84092
--- /dev/null
+++ b/OWNERS
@@ -0,0 +1,2 @@
+szuweilin@google.com
+ycchen@google.com

diff --git a/build/tasks/kernel.mk b/build/tasks/kernel.mk
index f09d51c..6c25b2c 100644 (file)
--- a/build/tasks/kernel.mk
+++ b/build/tasks/kernel.mk
@@ -25,9 +25,10 @@ TARGET_KERNEL_CONFIG ?= goldfish_defconfig
 KERNEL_CONFIG_DIR := arch/arm/configs
 endif
 
+KERNEL_CLANG_CLAGS := HOSTCC=$(abspath $(LLVM_PREBUILTS_PATH)/clang)
 ifeq ($(BUILD_KERNEL_WITH_CLANG),true)
 CROSS_COMPILE := x86_64-linux-androidkernel-
-KERNEL_CLANG_CLAGS := CC=clang HOSTCC=clang CLANG_TRIPLE=x86_64-linux-gnu- PATH=$(abspath $(LLVM_PREBUILTS_BASE)/$(BUILD_OS)-x86/$(LLVM_PREBUILTS_VERSION)/bin):$$PATH
+KERNEL_CLANG_CLAGS += CC=$(abspath $(LLVM_PREBUILTS_PATH)/clang) CLANG_TRIPLE=x86_64-linux-gnu-
 else
 ifeq ($(TARGET_KERNEL_ARCH),x86_64)
 ifeq ($(HOST_OS),darwin)
@@ -40,9 +41,15 @@ CROSS_COMPILE ?= $(abspath $(TARGET_TOOLS_PREFIX))
 endif
 endif
 
-KBUILD_OUTPUT := $(abspath $(TARGET_OUT_INTERMEDIATES)/kernel)
-mk_kernel := + $(hide) $(MAKE) $(if $(filter darwin,$(HOST_OS)),-j$$(sysctl -n hw.ncpu) -l$$(($$(sysctl -n hw.ncpu)+2)),-j$$(nproc) -l$$(($$(nproc)+2))) \
-       -C $(KERNEL_DIR) O=$(KBUILD_OUTPUT) ARCH=$(TARGET_ARCH) CROSS_COMPILE="$(abspath $(CC_WRAPPER)) $(CROSS_COMPILE)" $(if $(SHOW_COMMANDS),V=1) \
+KBUILD_OUTPUT := $(TARGET_OUT_INTERMEDIATES)/kernel
+ifeq ($(HOST_OS),darwin)
+KBUILD_JOBS := $(shell /usr/sbin/sysctl -n hw.ncpu)
+else
+KBUILD_JOBS := $(shell echo $$((1-(`cat /sys/devices/system/cpu/present`))))
+endif
+
+mk_kernel := + $(hide) prebuilts/build-tools/$(HOST_PREBUILT_TAG)/bin/make -j$(KBUILD_JOBS) -l$$(($(KBUILD_JOBS)+2)) \
+       -C $(KERNEL_DIR) O=$(abspath $(KBUILD_OUTPUT)) ARCH=$(TARGET_ARCH) CROSS_COMPILE="$(abspath $(CC_WRAPPER)) $(CROSS_COMPILE)" $(if $(SHOW_COMMANDS),V=1) \
        YACC=$(abspath $(BISON)) LEX=$(abspath $(LEX)) \
        $(KERNEL_CLANG_CLAGS)
 
@@ -55,14 +62,24 @@ FIRMWARE_ENABLED := $(shell grep ^CONFIG_FIRMWARE_IN_KERNEL=y $(KERNEL_CONFIG_FI
 # but I don't want to write a complex Android.mk to build kernel.
 # This is the simplest way I can think.
 KERNEL_DOTCONFIG_FILE := $(KBUILD_OUTPUT)/.config
-KERNEL_ARCH_CHANGED := $(if $(filter 0,$(shell grep -s ^$(if $(filter x86,$(TARGET_KERNEL_ARCH)),\#.)CONFIG_64BIT $(KERNEL_DOTCONFIG_FILE) | wc -l)),FORCE)
+ifneq ($(filter 0,$(shell grep -s ^$(if $(filter x86,$(TARGET_KERNEL_ARCH)),\#.)CONFIG_64BIT $(KERNEL_DOTCONFIG_FILE) | wc -l)),)
+KERNEL_ARCH_CHANGED := $(KERNEL_DOTCONFIG_FILE)-
+$(KERNEL_ARCH_CHANGED):
+               @touch $@
+endif
 $(KERNEL_DOTCONFIG_FILE): $(KERNEL_CONFIG_FILE) $(wildcard $(TARGET_KERNEL_DIFFCONFIG)) $(KERNEL_ARCH_CHANGED)
        $(hide) mkdir -p $(@D) && cat $(wildcard $^) > $@
        $(hide) ln -sf ../../../../../../prebuilts $(@D)
-       $(mk_kernel) olddefconfig
+       $(hide) rm -f $(KERNEL_ARCH_CHANGED)
 
 BUILT_KERNEL_TARGET := $(KBUILD_OUTPUT)/arch/$(TARGET_ARCH)/boot/$(KERNEL_TARGET)
 $(BUILT_KERNEL_TARGET): $(KERNEL_DOTCONFIG_FILE)
+       # A dirty hack to use ar & ld
+       $(hide) mkdir -p $(OUT_DIR)/.path; ln -sf ../../$(LLVM_PREBUILTS_PATH)/llvm-ar $(OUT_DIR)/.path/ar; ln -sf ../../$(LLVM_PREBUILTS_PATH)/ld.lld $(OUT_DIR)/.path/ld
+ifeq ($(BUILD_KERNEL_WITH_CLANG),true)
+       $(hide) cd $(OUT_DIR)/.path; ln -sf ../../$(dir $(TARGET_TOOLS_PREFIX))x86_64-linux-androidkernel-* .; ln -sf x86_64-linux-androidkernel-as x86_64-linux-gnu-as
+endif
+       $(mk_kernel) olddefconfig
        $(mk_kernel) $(KERNEL_TARGET) $(if $(MOD_ENABLED),modules)
        $(if $(FIRMWARE_ENABLED),$(mk_kernel) INSTALL_MOD_PATH=$(abspath $(TARGET_OUT)) firmware_install)
 
@@ -92,7 +109,7 @@ installclean: FILES += $(KBUILD_OUTPUT) $(INSTALLED_KERNEL_TARGET)
 
 TARGET_PREBUILT_KERNEL := $(BUILT_KERNEL_TARGET)
 
-.PHONY: kernel $(if $(KERNEL_ARCH_CHANGED),$(KERNEL_HEADERS_COMMON)/linux/binder.h)
+.PHONY: kernel
 kernel: $(INSTALLED_KERNEL_TARGET) $(KERNEL_MODULES_DEP)
 
 endif # TARGET_PREBUILT_KERNEL

diff --git a/build/tasks/system.mk b/build/tasks/system.mk
index fef6d0e..c81b995 100644 (file)
--- a/build/tasks/system.mk
+++ b/build/tasks/system.mk
@@ -1,5 +1,6 @@
-$(PRODUCT_OUT)/build.prop: $(INSTALLED_BUILD_PROP_TARGET)
-       sed -E '/ro.product.manufacturer|ro.product.model/d' $< > $@ && cat $@ > $<
+$(PRODUCT_OUT)/build.prop: $(INSTALLED_BUILD_PROP_TARGET) $(INSTALLED_VENDOR_BUILD_PROP_TARGET)
+       ln -sf ../system/bin/modprobe $(TARGET_ROOT_OUT_SBIN) && \
+       sed -i -E '/ro.product.*manufacturer|ro.product.*model/d' $^ && touch $@
 
 $(BUILT_SYSTEMIMAGE): $(PRODUCT_OUT)/build.prop
 

diff --git a/device.mk b/device.mk
index 2efbe94..7a26cf8 100644 (file)
--- a/device.mk
+++ b/device.mk
@@ -23,7 +23,10 @@ PRODUCT_PROPERTY_OVERRIDES := \
     ro.com.android.dataroaming=true \
     media.sf.hwaccel=1 \
     media.sf.omx-plugin=libffmpeg_omx.so \
-    media.sf.extractor-plugin=libffmpeg_extractor.so
+    media.sf.extractor-plugin=libffmpeg_extractor.so \
+    debug.stagefright.ccodec=0 \
+    debug.stagefright.omx_default_rank.sw-audio=1 \
+    debug.stagefright.omx_default_rank=0
 
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES := \
     ro.arch=x86 \
@@ -49,6 +52,9 @@ PRODUCT_COPY_FILES += \
     device/sample/etc/apns-full-conf.xml:system/etc/apns-conf.xml \
     device/sample/etc/old-apns-conf.xml:system/etc/old-apns-conf.xml \
     frameworks/av/media/libstagefright/data/media_codecs_google_audio.xml:system/etc/media_codecs_google_audio.xml \
+    frameworks/av/media/libstagefright/data/media_codecs_google_c2.xml:system/etc/media_codecs_google_c2.xml \
+    frameworks/av/media/libstagefright/data/media_codecs_google_c2_audio.xml:system/etc/media_codecs_google_c2_audio.xml \
+    frameworks/av/media/libstagefright/data/media_codecs_google_c2_video.xml:system/etc/media_codecs_google_c2_video.xml \
     frameworks/av/media/libstagefright/data/media_codecs_google_video.xml:system/etc/media_codecs_google_video.xml \
     frameworks/native/data/etc/tablet_core_hardware.xml:system/etc/permissions/tablet_core_hardware.xml \
     frameworks/native/data/etc/android.hardware.audio.low_latency.xml:system/etc/permissions/android.hardware.audio.low_latency.xml \

diff --git a/init.sh b/init.sh
index e5fc8f0..8ecd243 100644 (file)
--- a/init.sh
+++ b/init.sh
@@ -201,6 +201,7 @@ function init_hal_gralloc()
                        ;;
        esac
 
+       [ -z "$(getprop ro.hardware.gralloc)" ] && set_property ro.hardware.egl swiftshader
        [ -n "$DEBUG" ] && set_property debug.egl.trace error
 }
 
@@ -548,8 +549,13 @@ for c in `cat /proc/cmdline`; do
                                case $c in
                                        DEBUG=*)
                                                [ -n "$DEBUG" ] && set_property debug.logcat 1
+                                               [ "$DEBUG" = "0" ] || SETUPWIZARD=${SETUPWIZARD:-0}
+                                               ;;
+                                       DPI=*)
+                                               set_property ro.sf.lcd_density "$DPI"
                                                ;;
                                esac
+                               [ "$SETUPWIZARD" = "0" ] && set_property ro.setupwizard.mode DISABLED
                        fi
                        ;;
        esac

diff --git a/manifest.xml b/manifest.xml
index 909f878..fc07597 100644 (file)
--- a/manifest.xml
+++ b/manifest.xml
@@ -36,15 +36,6 @@
         </interface>
     </hal>
     <hal format="hidl">
-        <name>android.hardware.cas</name>
-        <transport>hwbinder</transport>
-        <version>1.0</version>
-        <interface>
-            <name>IMediaCasService</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
-    <hal format="hidl">
         <name>android.hardware.configstore</name>
         <transport>hwbinder</transport>
         <version>1.0</version>
@@ -148,6 +139,21 @@
         </interface>
     </hal>
     <hal format="hidl">
+        <name>android.hardware.drm</name>
+        <transport>hwbinder</transport>
+        <version>1.0</version>
+        <interface>
+            <name>ICryptoFactory</name>
+            <instance>default</instance>
+        </interface>
+        <interface>
+            <name>IDrmFactory</name>
+            <instance>default</instance>
+        </interface>
+        <fqname>@1.2::ICryptoFactory/clearkey</fqname>
+        <fqname>@1.2::IDrmFactory/clearkey</fqname>
+    </hal>
+    <hal format="hidl">
         <name>android.hardware.gnss</name>
         <transport>hwbinder</transport>
         <version>1.0</version>

diff --git a/media_codecs.xml b/media_codecs.xml
index 5b31bac..c300963 100644 (file)
--- a/media_codecs.xml
+++ b/media_codecs.xml
@@ -78,6 +78,7 @@ Only the three quirks included above are recognized at this point:
 -->
 
 <MediaCodecs>
+    <Include href="media_codecs_c2.xml" />
     <Include href="media_codecs_ffmpeg.xml" />
     <Include href="media_codecs_google_audio.xml" />
     <Include href="media_codecs_google_video.xml" />

diff --git a/nativebridge/Android.mk b/nativebridge/Android.mk
index 378ce69..0e4922d 100644 (file)
--- a/nativebridge/Android.mk
+++ b/nativebridge/Android.mk
@@ -20,7 +20,7 @@ LOCAL_SHARED_LIBRARIES := libcutils libdl liblog
 LOCAL_C_INCLUDES := system/core/libnativebridge/include
 LOCAL_MULTILIB := both
 LOCAL_POST_INSTALL_CMD := $(hide) \
-    rm -rf $(TARGET_OUT)/*/{arm*,*houdini*} {$(TARGET_OUT),$(PRODUCT_OUT)}/vendor/{*/arm*,*/*houdini*}; \
+    rm -rf $(TARGET_OUT)/{bin,lib}/{arm*,*houdini*} {$(TARGET_OUT),$(PRODUCT_OUT)}/vendor/{bin,lib}/{arm*,*houdini*}; \
     mkdir -p $(TARGET_OUT)/{lib/arm,$(if $(filter true,$(TARGET_IS_64_BIT)),lib64/arm64)}; \
     touch $(TARGET_OUT)/lib/libhoudini.so $(if $(filter true,$(TARGET_IS_64_BIT)),$(TARGET_OUT)/lib64/libhoudini.so)
 

diff --git a/nativebridge/bin/enable_nativebridge b/nativebridge/bin/enable_nativebridge
index 32b2e2f..5dff00b 100644 (file)
--- a/nativebridge/bin/enable_nativebridge
+++ b/nativebridge/bin/enable_nativebridge
@@ -15,7 +15,8 @@ urls[5]=http://tinyurl.com/y6g6cx27
 
 mount_sfs()
 {
-       mount -o 'context="u:object_r:system_file:s0"' $1 $2
+       lodevice=`losetup -r -f -s $1`
+       [ -n "$lodevice" ] && mount -o 'context="u:object_r:system_file:s0"' $lodevice $2
 }
 
 if [ -z "$1" ]; then

diff --git a/nativebridge/nativebridge.mk b/nativebridge/nativebridge.mk
index 6f0a236..1fa831e 100644 (file)
--- a/nativebridge/nativebridge.mk
+++ b/nativebridge/nativebridge.mk
@@ -32,7 +32,7 @@ PRODUCT_PROPERTY_OVERRIDES += \
 endif
 
 ifneq ($(HOUDINI_PREINSTALL),intel)
-PRODUCT_DEFAULT_PROPERTY_OVERRIDES := ro.dalvik.vm.native.bridge=libnb.so
+PRODUCT_PROPERTY_OVERRIDES := ro.dalvik.vm.native.bridge=libnb.so
 
 PRODUCT_PACKAGES := libnb
 endif

diff --git a/nfc/libnfc-nci.conf b/nfc/libnfc-nci.conf
index 168098b..7c686fb 100644 (file)
--- a/nfc/libnfc-nci.conf
+++ b/nfc/libnfc-nci.conf
@@ -35,7 +35,7 @@ SCREEN_OFF_POWER_STATE=1
 # NFA_TECHNOLOGY_MASK_KOVIO         0x20    /* Proprietary Technology       */
 # NFA_TECHNOLOGY_MASK_A_ACTIVE      0x40    /* NFC Technology A active mode */
 # NFA_TECHNOLOGY_MASK_F_ACTIVE      0x80    /* NFC Technology F active mode */
-#POLLING_TECH_MASK=0xEF
+POLLING_TECH_MASK=0x2F
 
 ###############################################################################
 # Force P2P to only listen for the following technology(s).
@@ -48,7 +48,7 @@ SCREEN_OFF_POWER_STATE=1
 # NFA_TECHNOLOGY_MASK_F             0x04    /* NFC Technology F             */
 # NFA_TECHNOLOGY_MASK_A_ACTIVE      0x40    /* NFC Technology A active mode */
 # NFA_TECHNOLOGY_MASK_F_ACTIVE      0x80    /* NFC Technology F active mode */
-#P2P_LISTEN_TECH_MASK=0xC5
+P2P_LISTEN_TECH_MASK=0x00
 
 ###############################################################################
 # Force UICC to only listen to the following technology(s).

diff --git a/packages.mk b/packages.mk
index a1e102b..915a885 100644 (file)
--- a/packages.mk
+++ b/packages.mk
@@ -99,3 +99,21 @@ PRODUCT_PACKAGES += \
 PRODUCT_PACKAGES += \
     Eleven \
     TSCalibration2 \
+
+# Debug tools
+PRODUCT_PACKAGES_DEBUG := \
+    avdtptest \
+    avinfo \
+    avtest \
+    bneptest \
+    btmgmt \
+    btmon \
+    btproxy \
+    haltest \
+    l2ping \
+    l2test \
+    mcaptest \
+    rctest \
+
+PRODUCT_HOST_PACKAGES := \
+    qemu-android \

diff --git a/sepolicy/nonplat/domain.te b/sepolicy/nonplat/domain.te
index 0bc8d87..e69de29 100644 (file)
--- a/sepolicy/nonplat/domain.te
+++ b/sepolicy/nonplat/domain.te
@@ -1 +0,0 @@
-allow domain cpuctl_device:dir search;

diff --git a/treble.mk b/treble.mk
index 5cbc454..920ff8d 100644 (file)
--- a/treble.mk
+++ b/treble.mk
@@ -25,6 +25,11 @@ PRODUCT_PACKAGES += \
     android.hardware.camera.provider@2.4-impl \
     android.hardware.camera.provider@2.4-service
 
+# Media codec
+PRODUCT_PACKAGES += \
+    android.hardware.media.c2@1.0-service \
+    android.hardware.media.omx@1.0-service
+
 # DumpState HAL
 PRODUCT_PACKAGES += \
     android.hardware.dumpstate@1.0-impl \
@@ -75,6 +80,12 @@ PRODUCT_PACKAGES += \
 PRODUCT_PACKAGES += \
     android.hardware.wifi@1.0-service
 
+# Drm HAL
+PRODUCT_PACKAGES += \
+    android.hardware.drm@1.0-impl \
+    android.hardware.drm@1.0-service \
+    android.hardware.drm@1.2-service.clearkey
+
 # GPS HAL
 PRODUCT_PACKAGES += \
     android.hardware.gnss@1.0-impl \

diff --git a/ueventd.x86.rc b/ueventd.x86.rc
index e2189fe..97a8e60 100644 (file)
--- a/ueventd.x86.rc
+++ b/ueventd.x86.rc
@@ -3,6 +3,7 @@
 /dev/ttyUSB*              0660  radio         radio
 /dev/video*               0660  cameraserver  system
 /dev/iio:device*          0660  system        system
+/dev/ion                  0664  system        system
 
 # for bluetooth nodes
 /dev/rfkill               0660  bluetooth     wifi

diff --git a/x86.mk b/x86.mk
index 9026430..7fb561d 100644 (file)
--- a/x86.mk
+++ b/x86.mk
@@ -21,6 +21,8 @@
 PRODUCT_PROPERTY_OVERRIDES := \
     ro.com.android.dateformat=MM-dd-yyyy \
 
+PRODUCT_USE_DYNAMIC_PARTITION_SIZE := true
+
 $(call inherit-product,$(LOCAL_PATH)/device.mk)
 
 # Get a list of languages.