openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

Merge "Update references to build/core to build/make/core"

This commit is contained in:
Colin Cross 2017-10-20 23:41:12 +00:00 committed by Gerrit Code Review
parent 8bef6515da 6cdc5d20f3
commit 6db8597174
13 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/Makefile
View File

@ -2644,7 +2644,7 @@ endif
name := $(name)-symbols-$(FILE_NAME_TAG) name := $(name)-symbols-$(FILE_NAME_TAG)
SYMBOLS_ZIP := $(PRODUCT_OUT)/$(name).zip SYMBOLS_ZIP := $(PRODUCT_OUT)/$(name).zip
# For apps_only build we'll establish the dependency later in build/core/main.mk. # For apps_only build we'll establish the dependency later in build/make/core/main.mk.
ifndef TARGET_BUILD_APPS ifndef TARGET_BUILD_APPS
$(SYMBOLS_ZIP): $(INSTALLED_SYSTEMIMAGE) \ $(SYMBOLS_ZIP): $(INSTALLED_SYSTEMIMAGE) \
$(INSTALLED_BOOTIMAGE_TARGET) \ $(INSTALLED_BOOTIMAGE_TARGET) \
@ -2710,7 +2710,7 @@ ifeq (true,$(EMMA_INSTRUMENT))
# An archive of classes for use in generating code-coverage reports # An archive of classes for use in generating code-coverage reports
# These are the uninstrumented versions of any classes that were # These are the uninstrumented versions of any classes that were
# to be instrumented. # to be instrumented.
# Any dependencies are set up later in build/core/main.mk. # Any dependencies are set up later in build/make/core/main.mk.
JACOCO_REPORT_CLASSES_ALL := $(PRODUCT_OUT)/jacoco-report-classes-all.jar JACOCO_REPORT_CLASSES_ALL := $(PRODUCT_OUT)/jacoco-report-classes-all.jar
$(JACOCO_REPORT_CLASSES_ALL) : $(JACOCO_REPORT_CLASSES_ALL) :
@ -2732,7 +2732,7 @@ endif # EMMA_INSTRUMENT=true
# #
ifdef TARGET_BUILD_APPS ifdef TARGET_BUILD_APPS
PROGUARD_DICT_ZIP := $(PRODUCT_OUT)/$(TARGET_PRODUCT)-proguard-dict-$(FILE_NAME_TAG).zip PROGUARD_DICT_ZIP := $(PRODUCT_OUT)/$(TARGET_PRODUCT)-proguard-dict-$(FILE_NAME_TAG).zip
# the dependency will be set up later in build/core/main.mk. # the dependency will be set up later in build/make/core/main.mk.
$(PROGUARD_DICT_ZIP) : $(PROGUARD_DICT_ZIP) :
@echo "Packaging Proguard obfuscation dictionary files." @echo "Packaging Proguard obfuscation dictionary files."
$(hide) dict_files=`find $(TARGET_OUT_COMMON_INTERMEDIATES)/APPS -name proguard_dictionary`; \ $(hide) dict_files=`find $(TARGET_OUT_COMMON_INTERMEDIATES)/APPS -name proguard_dictionary`; \

6
core/cleanbuild.mk
View File

@ -21,7 +21,7 @@ PWD := $(shell pwd)
TOP := . TOP := .
TOPDIR := TOPDIR :=
BUILD_SYSTEM := $(TOPDIR)build/core BUILD_SYSTEM := $(TOPDIR)build/make/core
# Set up various standard variables based on configuration # Set up various standard variables based on configuration
# and host information. # and host information.
@ -48,7 +48,7 @@ INTERNAL_CLEAN_STEPS :=
# #
# $(1): shell command to run # $(1): shell command to run
# $(2): indicate to not use makefile path as part of step id if not empty. # $(2): indicate to not use makefile path as part of step id if not empty.
# $(2) should only be used in build/core/cleanspec.mk: just for compatibility. # $(2) should only be used in build/make/core/cleanspec.mk: just for compatibility.
define _add-clean-step define _add-clean-step
$(if $(strip $(INTERNAL_CLEAN_BUILD_VERSION)),, \ $(if $(strip $(INTERNAL_CLEAN_BUILD_VERSION)),, \
$(error INTERNAL_CLEAN_BUILD_VERSION not set)) $(error INTERNAL_CLEAN_BUILD_VERSION not set))
@ -67,7 +67,7 @@ define _add-clean-step
$(eval _acs_makefile_prefix :=) $(eval _acs_makefile_prefix :=)
endef endef
define add-clean-step define add-clean-step
$(eval # for build/core/cleanspec.mk, dont use makefile path as part of step id) \ $(eval # for build/make/core/cleanspec.mk, dont use makefile path as part of step id) \
$(if $(filter %/cleanspec.mk,$(lastword $(MAKEFILE_LIST))),\ $(if $(filter %/cleanspec.mk,$(lastword $(MAKEFILE_LIST))),\
$(eval $(call _add-clean-step,$(1),true)),\ $(eval $(call _add-clean-step,$(1),true)),\
$(eval $(call _add-clean-step,$(1)))) $(eval $(call _add-clean-step,$(1))))

2
core/combo/arch/x86/atom.mk
View File

@ -2,7 +2,7 @@
# 'x86-atom' arch variant. This is an extension of the 'x86' base variant # 'x86-atom' arch variant. This is an extension of the 'x86' base variant
# that adds Atom-specific features. # that adds Atom-specific features.
# #
# See build/core/combo/arch/x86/x86.mk for differences. # See build/make/core/combo/arch/x86/x86.mk for differences.
# #
ARCH_X86_HAVE_SSSE3 := true ARCH_X86_HAVE_SSSE3 := true
ARCH_X86_HAVE_MOVBE := true ARCH_X86_HAVE_MOVBE := true

2
core/combo/arch/x86/silvermont.mk
View File

@ -1,7 +1,7 @@
# This file contains feature macro definitions specific to the # This file contains feature macro definitions specific to the
# silvermont arch variant. # silvermont arch variant.
# #
# See build/core/combo/arch/x86/x86-atom.mk for differences. # See build/make/core/combo/arch/x86/x86-atom.mk for differences.
# #
ARCH_X86_HAVE_SSSE3 := true ARCH_X86_HAVE_SSSE3 := true

2
core/combo/arch/x86_64/silvermont.mk
View File

@ -1,7 +1,7 @@
# This file contains feature macro definitions specific to the # This file contains feature macro definitions specific to the
# silvermont arch variant. # silvermont arch variant.
# #
# See build/core/combo/arch/x86/x86-atom.mk for differences. # See build/make/core/combo/arch/x86/x86-atom.mk for differences.
# #
ARCH_X86_HAVE_SSSE3 := true ARCH_X86_HAVE_SSSE3 := true

6
core/main.mk
View File

@ -34,7 +34,7 @@ PWD := $(shell pwd)
TOP := . TOP := .
TOPDIR := TOPDIR :=
BUILD_SYSTEM := $(TOPDIR)build/core BUILD_SYSTEM := $(TOPDIR)build/make/core
# This is the default target. It must be the first declared target. # This is the default target. It must be the first declared target.
.PHONY: droid .PHONY: droid
@ -173,7 +173,7 @@ TARGET_BUILD_JAVA_SUPPORT_LEVEL := platform
# ----------------------------------------------------------------- # -----------------------------------------------------------------
# The pdk (Platform Development Kit) build # The pdk (Platform Development Kit) build
include build/core/pdk_config.mk include build/make/core/pdk_config.mk
# #
# ----------------------------------------------------------------- # -----------------------------------------------------------------
@ -936,7 +936,7 @@ ifdef is_sdk_build
$(warning $(ALL_MODULES.$(m).MAKEFILE): Module '$(m)' in PRODUCT_PACKAGES_TESTS has nothing to install!))) $(warning $(ALL_MODULES.$(m).MAKEFILE): Module '$(m)' in PRODUCT_PACKAGES_TESTS has nothing to install!)))
endif endif
# build/core/Makefile contains extra stuff that we don't want to pollute this # build/make/core/Makefile contains extra stuff that we don't want to pollute this
# top-level makefile with. It expects that ALL_DEFAULT_INSTALLED_MODULES # top-level makefile with. It expects that ALL_DEFAULT_INSTALLED_MODULES
# contains everything that's built during the current make, but it also further # contains everything that's built during the current make, but it also further
# extends ALL_DEFAULT_INSTALLED_MODULES. # extends ALL_DEFAULT_INSTALLED_MODULES.

2
core/product-graph.mk
View File

@ -34,7 +34,7 @@ define all-products-inner
endef endef
this_makefile := build/core/product-graph.mk this_makefile := build/make/core/product-graph.mk
products_svg := $(OUT_DIR)/products.svg products_svg := $(OUT_DIR)/products.svg
products_pdf := $(OUT_DIR)/products.pdf products_pdf := $(OUT_DIR)/products.pdf

2
core/product_config.mk
View File

@ -339,7 +339,7 @@ endif
# The file at the source path should be copied to the destination path # The file at the source path should be copied to the destination path
# when building this product. <destination path> is relative to # when building this product. <destination path> is relative to
# $(PRODUCT_OUT), so it should look like, e.g., "system/etc/file.xml". # $(PRODUCT_OUT), so it should look like, e.g., "system/etc/file.xml".
# The rules for these copy steps are defined in build/core/Makefile. # The rules for these copy steps are defined in build/make/core/Makefile.
# The optional :<owner> is used to indicate the owner of a vendor file. # The optional :<owner> is used to indicate the owner of a vendor file.
PRODUCT_COPY_FILES := \ PRODUCT_COPY_FILES := \
$(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_COPY_FILES)) $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_COPY_FILES))

2
core/root.mk
View File

@ -1,3 +1,3 @@
### DO NOT EDIT THIS FILE ### ### DO NOT EDIT THIS FILE ###
include build/core/main.mk include build/make/core/main.mk
### DO NOT EDIT THIS FILE ### ### DO NOT EDIT THIS FILE ###

4
core/tasks/boot_jars_package_check.mk
View File

@ -24,8 +24,8 @@ intermediates := $(call intermediates-dir-for, PACKAGING, boot-jars-package-chec
stamp := $(intermediates)/stamp stamp := $(intermediates)/stamp
built_boot_jars := $(foreach j, $(PRODUCT_BOOT_JARS), \ built_boot_jars := $(foreach j, $(PRODUCT_BOOT_JARS), \
$(call intermediates-dir-for, JAVA_LIBRARIES, $(j),,COMMON)/classes.jar) $(call intermediates-dir-for, JAVA_LIBRARIES, $(j),,COMMON)/classes.jar)
script := build/core/tasks/check_boot_jars/check_boot_jars.py script := build/make/core/tasks/check_boot_jars/check_boot_jars.py
whitelist_file := build/core/tasks/check_boot_jars/package_whitelist.txt whitelist_file := build/make/core/tasks/check_boot_jars/package_whitelist.txt
$(stamp): PRIVATE_BOOT_JARS := $(built_boot_jars) $(stamp): PRIVATE_BOOT_JARS := $(built_boot_jars)
$(stamp): PRIVATE_SCRIPT := $(script) $(stamp): PRIVATE_SCRIPT := $(script)

8
envsetup.sh
View File

@ -697,7 +697,7 @@ function tapas()
function gettop function gettop
{ {
local TOPFILE=build/core/envsetup.mk local TOPFILE=build/make/core/envsetup.mk
if [ -n "$TOP" -a -f "$TOP/$TOPFILE" ] ; then if [ -n "$TOP" -a -f "$TOP/$TOPFILE" ] ; then
# The following circumlocution ensures we remove symlinks from TOP. # The following circumlocution ensures we remove symlinks from TOP.
(cd $TOP; PWD= /bin/pwd) (cd $TOP; PWD= /bin/pwd)
@ -731,7 +731,7 @@ function getdriver()
# Use scan-build to collect all static analyzer reports into directory # Use scan-build to collect all static analyzer reports into directory
# /tmp/scan-build-yyyy-mm-dd-hhmmss-* # /tmp/scan-build-yyyy-mm-dd-hhmmss-*
# The clang compiler passed by --use-analyzer here is not important. # The clang compiler passed by --use-analyzer here is not important.
# build/core/binary.mk will set CLANG_CXX and CLANG before calling # build/make/core/binary.mk will set CLANG_CXX and CLANG before calling
# c++-analyzer and ccc-analyzer. # c++-analyzer and ccc-analyzer.
local CLANG_VERSION=$(get_build_var LLVM_PREBUILTS_VERSION) local CLANG_VERSION=$(get_build_var LLVM_PREBUILTS_VERSION)
local BUILD_OS=$(get_build_var BUILD_OS) local BUILD_OS=$(get_build_var BUILD_OS)
@ -757,7 +757,7 @@ function m()
function findmakefile() function findmakefile()
{ {
local TOPFILE=build/core/envsetup.mk local TOPFILE=build/make/core/envsetup.mk
local HERE=$PWD local HERE=$PWD
local T= local T=
while [ \( ! \( -f $TOPFILE \) \) -a \( $PWD != "/" \) ]; do while [ \( ! \( -f $TOPFILE \) \) -a \( $PWD != "/" \) ]; do
@ -967,7 +967,7 @@ function croot()
function cproj() function cproj()
{ {
local TOPFILE=build/core/envsetup.mk local TOPFILE=build/make/core/envsetup.mk
local HERE=$PWD local HERE=$PWD
local T= local T=
while [ \( ! \( -f $TOPFILE \) \) -a \( $PWD != "/" \) ]; do while [ \( ! \( -f $TOPFILE \) \) -a \( $PWD != "/" \) ]; do

2
target/product/security/README
View File

@ -34,5 +34,5 @@ input and prints a C structure to standard output:
$ java -jar out/host/linux-x86/framework/dumpkey.jar build/target/product/security/testkey.x509.pem $ java -jar out/host/linux-x86/framework/dumpkey.jar build/target/product/security/testkey.x509.pem
{64,0xc926ad21,{1795090719,2141396315,950055447,2581568430,4268923165,1920809988,546586521,3498997798,1776797858,3740060814,1805317999,1429410244,129622599,1422441418,1783893377,1222374759,2563319927,323993566,28517732,609753416,1826472888,215237850,4261642700,4049082591,3228462402,774857746,154822455,2497198897,2758199418,3019015328,2794777644,87251430,2534927978,120774784,571297800,3695899472,2479925187,3811625450,3401832990,2394869647,3267246207,950095497,555058928,414729973,1136544882,3044590084,465547824,4058146728,2731796054,1689838846,3890756939,1048029507,895090649,247140249,178744550,3547885223,3165179243,109881576,3944604415,1044303212,3772373029,2985150306,3737520932,3599964420},{3437017481,3784475129,2800224972,3086222688,251333580,2131931323,512774938,325948880,2657486437,2102694287,3820568226,792812816,1026422502,2053275343,2800889200,3113586810,165549746,4273519969,4065247892,1902789247,772932719,3941848426,3652744109,216871947,3164400649,1942378755,3996765851,1055777370,964047799,629391717,2232744317,3910558992,191868569,2758883837,3682816752,2997714732,2702529250,3570700455,3776873832,3924067546,3555689545,2758825434,1323144535,61311905,1997411085,376844204,213777604,4077323584,9135381,1625809335,2804742137,2952293945,1117190829,4237312782,1825108855,3013147971,1111251351,2568837572,1684324211,2520978805,367251975,810756730,2353784344,1175080310}} {64,0xc926ad21,{1795090719,2141396315,950055447,2581568430,4268923165,1920809988,546586521,3498997798,1776797858,3740060814,1805317999,1429410244,129622599,1422441418,1783893377,1222374759,2563319927,323993566,28517732,609753416,1826472888,215237850,4261642700,4049082591,3228462402,774857746,154822455,2497198897,2758199418,3019015328,2794777644,87251430,2534927978,120774784,571297800,3695899472,2479925187,3811625450,3401832990,2394869647,3267246207,950095497,555058928,414729973,1136544882,3044590084,465547824,4058146728,2731796054,1689838846,3890756939,1048029507,895090649,247140249,178744550,3547885223,3165179243,109881576,3944604415,1044303212,3772373029,2985150306,3737520932,3599964420},{3437017481,3784475129,2800224972,3086222688,251333580,2131931323,512774938,325948880,2657486437,2102694287,3820568226,792812816,1026422502,2053275343,2800889200,3113586810,165549746,4273519969,4065247892,1902789247,772932719,3941848426,3652744109,216871947,3164400649,1942378755,3996765851,1055777370,964047799,629391717,2232744317,3910558992,191868569,2758883837,3682816752,2997714732,2702529250,3570700455,3776873832,3924067546,3555689545,2758825434,1323144535,61311905,1997411085,376844204,213777604,4077323584,9135381,1625809335,2804742137,2952293945,1117190829,4237312782,1825108855,3013147971,1111251351,2568837572,1684324211,2520978805,367251975,810756730,2353784344,1175080310}}
This is called by build/core/Makefile to incorporate the OTA signing keys This is called by build/make/core/Makefile to incorporate the OTA signing keys
into the recovery image. into the recovery image.

2
tools/apicheck/etc/apicheck
View File

@ -18,7 +18,7 @@
# and set up progdir to be the fully-qualified pathname of its directory. # and set up progdir to be the fully-qualified pathname of its directory.
# #
# The classpath and other java options used in apicheck are specified in # The classpath and other java options used in apicheck are specified in
# build/core/tasks/apicheck.mk. # build/make/core/tasks/apicheck.mk.
prog="$0" prog="$0"
while [ -h "${prog}" ]; do while [ -h "${prog}" ]; do