OSDN Git Service

Merge tag 'android-7.1.2_r39' into nougat-x86 android-x86-7.1-r3
authorChih-Wei Huang <cwhuang@linux.org.tw>
Wed, 16 Oct 2019 10:37:34 +0000 (18:37 +0800)
committerChih-Wei Huang <cwhuang@linux.org.tw>
Wed, 16 Oct 2019 10:37:34 +0000 (18:37 +0800)
Android 7.1.2 Release 39 (5787804)

CleanSpec.mk
core/Makefile
core/build_id.mk
core/main.mk
core/product.mk
core/tasks/kernel.mk [new file with mode: 0644]
core/version_defaults.mk
target/product/generic_no_telephony.mk

index a97c71a..9a7db98 100644 (file)
@@ -378,6 +378,8 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/recovery/root/sdcard)
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/*)
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/priv-app/*)
 
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib*/hw/power.default.so)
+
 # ************************************************
 # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
 # ************************************************
index d8b4ef8..1075d8d 100644 (file)
@@ -202,7 +202,7 @@ system_prop_file := $(TARGET_SYSTEM_PROP)
 else
 system_prop_file := $(wildcard $(TARGET_DEVICE_DIR)/system.prop)
 endif
-$(intermediate_system_build_prop): $(BUILDINFO_SH) $(INTERNAL_BUILD_ID_MAKEFILE) $(BUILD_SYSTEM)/version_defaults.mk $(system_prop_file) $(INSTALLED_ANDROID_INFO_TXT_TARGET)
+$(intermediate_system_build_prop): $(BUILDINFO_SH) $(INTERNAL_BUILD_ID_MAKEFILE) $(BUILD_SYSTEM)/version_defaults.mk $(system_prop_file) $(TARGET_DEVICE_DIR)/BoardConfig.mk $(INSTALLED_ANDROID_INFO_TXT_TARGET)
        @echo Target buildinfo: $@
        @mkdir -p $(dir $@)
        $(hide) echo > $@
@@ -1178,7 +1178,14 @@ endif
 $(INSTALLED_SYSTEMIMAGE): $(BUILT_SYSTEMIMAGE) $(RECOVERY_FROM_BOOT_PATCH) | $(ACP)
        @echo "Install system fs image: $@"
        $(copy-file-to-target)
+ifneq (0,$(BOARD_SYSTEMIMAGE_PARTITION_SIZE))
        $(hide) $(call assert-max-image-size,$@ $(RECOVERY_FROM_BOOT_PATCH),$(BOARD_SYSTEMIMAGE_PARTITION_SIZE))
+endif
+
+ifneq ($(MKSQUASHFS),)
+$(PRODUCT_OUT)/system.sfs: $(BUILT_SYSTEMIMAGE)
+       $(call build-squashfs-target,$^,$@)
+endif
 
 systemimage: $(INSTALLED_SYSTEMIMAGE)
 
@@ -1187,7 +1194,9 @@ systemimage-nodeps snod: $(filter-out systemimage-nodeps snod,$(MAKECMDGOALS)) \
                    | $(INTERNAL_USERIMAGES_DEPS)
        @echo "make $@: ignoring dependencies"
        $(call build-systemimage-target,$(INSTALLED_SYSTEMIMAGE))
+ifneq (0,$(BOARD_SYSTEMIMAGE_PARTITION_SIZE))
        $(hide) $(call assert-max-image-size,$(INSTALLED_SYSTEMIMAGE),$(BOARD_SYSTEMIMAGE_PARTITION_SIZE))
+endif
 
 ifneq (,$(filter systemimage-nodeps snod, $(MAKECMDGOALS)))
 ifeq (true,$(WITH_DEXPREOPT))
index 8f3bfef..7364044 100644 (file)
@@ -18,4 +18,4 @@
 # (like "CRB01").  It must be a single word, and is
 # capitalized by convention.
 
-export BUILD_ID=N2G47J
+export BUILD_ID=N2G48H
index a612f83..f5baeac 100644 (file)
@@ -210,39 +210,6 @@ $(info ************************************************************)
 $(error stop)
 endif
 
-# Check for the current JDK.
-#
-# For Java 1.7/1.8, we require OpenJDK on linux and Oracle JDK on Mac OS.
-requires_openjdk := false
-ifeq ($(BUILD_OS),linux)
-requires_openjdk := true
-endif
-
-
-# Check for the current jdk
-ifeq ($(requires_openjdk), true)
-# The user asked for openjdk, so check that the host
-# java version is really openjdk and not some other JDK.
-ifeq ($(shell echo '$(java_version_str)' | grep -i openjdk),)
-$(info ************************************************************)
-$(info You asked for an OpenJDK based build but your version is)
-$(info $(java_version_str).)
-$(info ************************************************************)
-$(error stop)
-endif # java version is not OpenJdk
-else # if requires_openjdk
-ifneq ($(shell echo '$(java_version_str)' | grep -i openjdk),)
-$(info ************************************************************)
-$(info You are attempting to build with an unsupported JDK.)
-$(info $(space))
-$(info You use OpenJDK but only Sun/Oracle JDK is supported.)
-$(info Please follow the machine setup instructions at)
-$(info $(space)$(space)$(space)$(space)https://source.android.com/source/download.html)
-$(info ************************************************************)
-$(error stop)
-endif # java version is not Sun Oracle JDK
-endif # if requires_openjdk
-
 KNOWN_INCOMPATIBLE_JAVAC_VERSIONS := google
 incompat_javac := $(foreach v,$(KNOWN_INCOMPATIBLE_JAVAC_VERSIONS),$(findstring $(v),$(javac_version_str)))
 ifneq ($(incompat_javac),)
index 332b015..27cd1d9 100644 (file)
@@ -270,7 +270,6 @@ _product_stash_var_list += \
        BOARD_EGL_CFG \
        BOARD_BOOTIMAGE_PARTITION_SIZE \
        BOARD_RECOVERYIMAGE_PARTITION_SIZE \
-       BOARD_SYSTEMIMAGE_PARTITION_SIZE \
        BOARD_SYSTEMIMAGE_FILE_SYSTEM_TYPE \
        BOARD_USERDATAIMAGE_FILE_SYSTEM_TYPE \
        BOARD_USERDATAIMAGE_PARTITION_SIZE \
diff --git a/core/tasks/kernel.mk b/core/tasks/kernel.mk
new file mode 100644 (file)
index 0000000..89377f1
--- /dev/null
@@ -0,0 +1,106 @@
+#
+# Copyright (C) 2014-2016 The Android-x86 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
+#
+
+ifneq ($(TARGET_NO_KERNEL),true)
+ifeq ($(TARGET_PREBUILT_KERNEL),)
+
+KERNEL_DIR ?= kernel
+
+ifneq ($(filter x86%,$(TARGET_ARCH)),)
+TARGET_KERNEL_ARCH ?= $(TARGET_ARCH)
+KERNEL_TARGET := bzImage
+TARGET_KERNEL_CONFIG ?= android-$(TARGET_KERNEL_ARCH)_defconfig
+KERNEL_CONFIG_DIR := arch/x86/configs
+endif
+ifeq ($(TARGET_ARCH),arm)
+KERNEL_TARGET := zImage
+TARGET_KERNEL_CONFIG ?= goldfish_defconfig
+KERNEL_CONFIG_DIR := arch/arm/configs
+endif
+
+ifeq ($(TARGET_KERNEL_ARCH),x86_64)
+CROSS_COMPILE ?= $(abspath prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.11-4.6/bin)/x86_64-linux-
+else
+CROSS_COMPILE ?= $(abspath $(TARGET_TOOLS_PREFIX))
+endif
+KBUILD_OUTPUT := $(abspath $(TARGET_OUT_INTERMEDIATES)/kernel)
+mk_kernel := $(hide) $(MAKE) -C $(KERNEL_DIR) O=$(KBUILD_OUTPUT) ARCH=$(TARGET_ARCH) CROSS_COMPILE="$(abspath $(CC_WRAPPER)) $(CROSS_COMPILE)" $(if $(SHOW_COMMANDS),V=1)
+
+KERNEL_CONFIG_FILE := $(if $(wildcard $(TARGET_KERNEL_CONFIG)),$(TARGET_KERNEL_CONFIG),$(KERNEL_DIR)/$(KERNEL_CONFIG_DIR)/$(TARGET_KERNEL_CONFIG))
+
+MOD_ENABLED := $(shell grep ^CONFIG_MODULES=y $(KERNEL_CONFIG_FILE))
+FIRMWARE_ENABLED := $(shell grep ^CONFIG_FIRMWARE_IN_KERNEL=y $(KERNEL_CONFIG_FILE))
+
+# I understand Android build system discourage to use submake,
+# 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)
+$(KERNEL_DOTCONFIG_FILE): $(KERNEL_CONFIG_FILE) $(wildcard $(TARGET_KERNEL_DIFFCONFIG)) $(KERNEL_ARCH_CHANGED)
+       $(hide) mkdir -p $(@D) && cat $(wildcard $^) > $@
+       $(hide) ln -sf ../../../../../../external $(@D)
+       $(mk_kernel) olddefconfig
+
+# bison is needed to build kernel and external modules from source
+BISON := $(HOST_OUT_EXECUTABLES)/bison$(HOST_EXECUTABLE_SUFFIX)
+
+BUILT_KERNEL_TARGET := $(KBUILD_OUTPUT)/arch/$(TARGET_ARCH)/boot/$(KERNEL_TARGET)
+$(BUILT_KERNEL_TARGET): $(KERNEL_DOTCONFIG_FILE) | $(BISON)
+       $(mk_kernel) $(KERNEL_TARGET) $(if $(MOD_ENABLED),modules)
+       $(if $(FIRMWARE_ENABLED),$(mk_kernel) INSTALL_MOD_PATH=$(abspath $(TARGET_OUT)) firmware_install)
+
+ifneq ($(MOD_ENABLED),)
+KERNEL_MODULES_DEP := $(firstword $(wildcard $(TARGET_OUT)/lib/modules/*/modules.dep))
+KERNEL_MODULES_DEP := $(if $(KERNEL_MODULES_DEP),$(KERNEL_MODULES_DEP),$(TARGET_OUT)/lib/modules)
+
+ALL_EXTRA_MODULES := $(patsubst %,$(TARGET_OUT_INTERMEDIATES)/kmodule/%,$(TARGET_EXTRA_KERNEL_MODULES))
+$(ALL_EXTRA_MODULES): $(TARGET_OUT_INTERMEDIATES)/kmodule/%: $(BUILT_KERNEL_TARGET)
+       @echo Building additional kernel module $*
+       $(hide) mkdir -p $(@D) && $(ACP) -fr $(EXTRA_KERNEL_MODULE_PATH_$*) $(@D)
+       $(mk_kernel) M=$(abspath $@) modules || ( rm -rf $@ && exit 1 )
+
+$(KERNEL_MODULES_DEP): $(BUILT_KERNEL_TARGET) $(ALL_EXTRA_MODULES)
+       $(hide) rm -rf $(TARGET_OUT)/lib/modules
+       $(mk_kernel) INSTALL_MOD_PATH=$(abspath $(TARGET_OUT)) modules_install
+       $(hide) for kmod in $(TARGET_EXTRA_KERNEL_MODULES) ; do \
+               echo Installing additional kernel module $${kmod} ; \
+               $(subst $(hide),,$(mk_kernel)) INSTALL_MOD_PATH=$(abspath $(TARGET_OUT)) M=$(abspath $(TARGET_OUT_INTERMEDIATES))/kmodule/$${kmod} modules_install ; \
+       done
+       $(hide) rm -f $(TARGET_OUT)/lib/modules/*/{build,source}
+endif
+
+$(BUILT_SYSTEMIMAGE): $(KERNEL_MODULES_DEP)
+
+# rules to get source of Broadcom 802.11a/b/g/n hybrid device driver
+# based on broadcomsetup.sh of Kyle Evans
+WL_PATH := $(KERNEL_DIR)/drivers/net/wireless/broadcom/wl
+ifeq ($(wildcard $(WL_PATH)/build.mk),)
+WL_PATH := $(KERNEL_DIR)/drivers/net/wireless/wl
+endif
+-include $(WL_PATH)/build.mk
+
+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)
+kernel: $(INSTALLED_KERNEL_TARGET) $(KERNEL_MODULES_DEP)
+
+endif # TARGET_PREBUILT_KERNEL
+
+ifndef CM_BUILD
+$(INSTALLED_KERNEL_TARGET): $(TARGET_PREBUILT_KERNEL) | $(ACP)
+       $(copy-file-to-new-target)
+ifdef TARGET_PREBUILT_MODULES
+       mkdir -p $(TARGET_OUT)/lib
+       $(hide) cp -r $(TARGET_PREBUILT_MODULES) $(TARGET_OUT)/lib
+endif
+endif # CM_BUILD
+endif # KBUILD_OUTPUT
index 47c5880..9ff3565 100644 (file)
@@ -131,7 +131,7 @@ ifeq "" "$(PLATFORM_SECURITY_PATCH)"
     #  It must be of the form "YYYY-MM-DD" on production devices.
     #  It must match one of the Android Security Patch Level strings of the Public Security Bulletins.
     #  If there is no $PLATFORM_SECURITY_PATCH set, keep it empty.
-    PLATFORM_SECURITY_PATCH := 2017-10-01
+    PLATFORM_SECURITY_PATCH := 2017-10-05
 endif
 
 ifeq "" "$(PLATFORM_BASE_OS)"
index 5c48358..d8f4588 100644 (file)
@@ -45,11 +45,9 @@ PRODUCT_PACKAGES += \
     libvideoeditorplayer \
 
 PRODUCT_PACKAGES += \
-    audio.primary.default \
     audio_policy.default \
     local_time.default \
     vibrator.default \
-    power.default
 
 PRODUCT_COPY_FILES := \
         frameworks/av/media/libeffects/data/audio_effects.conf:system/etc/audio_effects.conf