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
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
--- /dev/null
+szuweilin@google.com
+ycchen@google.com
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)
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)
# 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)
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
-$(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
;;
esac
+ [ -z "$(getprop ro.hardware.gralloc)" ] && set_property ro.hardware.egl swiftshader
[ -n "$DEBUG" ] && set_property debug.egl.trace error
}
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
</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>
<instance>default</instance>
</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>
</manifest>
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)
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
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
# 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).
# 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).
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 \
-allow domain cpuctl_device:dir search;
# Wifi HAL
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
/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
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.