openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity
15,583 Commits 2 Branches 1 Tag 73 MiB
Commit Graph

15583 Commits

Author SHA1 Message Date
Ying Wang c6c21d0622 Revert "Revert "Fix filter rule when checking for apks in PRODUCT_COPY_FILES."" 
This reverts commit 06b3255118.
 2014-01-21 20:25:46 -08:00
Ying Wang 036d2c1857 am 4a814d0a: am a0d68280: am f5db4548: am 62043de3: Merge "Revert "Fix filter rule when checking for apks in PRODUCT_COPY_FILES."" 
* commit '4a814d0a69470c96414a5e49b1ff90eb8935e2f9':
  Revert "Fix filter rule when checking for apks in PRODUCT_COPY_FILES."
 2014-01-22 04:06:56 +00:00
Ying Wang 4a814d0a69 am a0d68280: am f5db4548: am 62043de3: Merge "Revert "Fix filter rule when checking for apks in PRODUCT_COPY_FILES."" 
* commit 'a0d68280cae16645c2f16aeb6d8f614b76ba94a0':
  Revert "Fix filter rule when checking for apks in PRODUCT_COPY_FILES."
 2014-01-22 04:03:13 +00:00
Ying Wang a0d68280ca am f5db4548: am 62043de3: Merge "Revert "Fix filter rule when checking for apks in PRODUCT_COPY_FILES."" 
* commit 'f5db454865c7b8cff22cc8faaeb5b983f059cb73':
  Revert "Fix filter rule when checking for apks in PRODUCT_COPY_FILES."
 2014-01-22 04:00:19 +00:00
Ying Wang f5db454865 am 62043de3: Merge "Revert "Fix filter rule when checking for apks in PRODUCT_COPY_FILES."" 
* commit '62043de346dff2d31c58bc8c002699fc74d1351c':
  Revert "Fix filter rule when checking for apks in PRODUCT_COPY_FILES."
 2014-01-21 19:57:41 -08:00
Ying Wang 62043de346 Merge "Revert "Fix filter rule when checking for apks in PRODUCT_COPY_FILES."" 2014-01-22 03:48:59 +00:00
Ying Wang 06b3255118 Revert "Fix filter rule when checking for apks in PRODUCT_COPY_FILES." 
This reverts commit ca37190711.

Change-Id: I3a76f4cdf92ecbe3059bf5856cf341874e1393cf
 2014-01-22 03:48:27 +00:00
Colin Cross 3814cbfd33 build: use arm kernel headers for arm 2nd arch builds 
Compiling for arm requires using the arm kernel headers and not
the aarch64 kernel headers.  Add $(combo_2nd_arch_prefix) to get
asm-$(TARGET_2ND_ARCH) when arm is the 2nd arch.

Change-Id: I15270d0ef35e48c034bf4d0d5e35b76f67b2a8e1
 2014-01-21 17:01:20 -08:00
Ying Wang 2e494fcaf9 Merge "Support to build executables for TARGET_2ND_ARCH" 2014-01-21 21:24:01 +00:00
Ying Wang e9924d7715 am 6e8e82ea: am 10515519: am 70cc8553: am 8d1f91fa: Merge "Fix filter rule when checking for apks in PRODUCT_COPY_FILES." 
* commit '6e8e82ea585f964981896cc510f007574ce6da2c':
  Fix filter rule when checking for apks in PRODUCT_COPY_FILES.
 2014-01-21 20:44:23 +00:00
Ying Wang 6e8e82ea58 am 10515519: am 70cc8553: am 8d1f91fa: Merge "Fix filter rule when checking for apks in PRODUCT_COPY_FILES." 
* commit '10515519ee2a3eb50ef3c6054504972fa1bc1e00':
  Fix filter rule when checking for apks in PRODUCT_COPY_FILES.
 2014-01-21 20:41:21 +00:00
Ying Wang 10515519ee am 70cc8553: am 8d1f91fa: Merge "Fix filter rule when checking for apks in PRODUCT_COPY_FILES." 
* commit '70cc85533dacfaa499f39c417cfd78e3ed922414':
  Fix filter rule when checking for apks in PRODUCT_COPY_FILES.
 2014-01-21 20:37:50 +00:00
Ying Wang 70cc85533d am 8d1f91fa: Merge "Fix filter rule when checking for apks in PRODUCT_COPY_FILES." 
* commit '8d1f91fa548c80357fffbdbdd5dcccc3c461c9ec':
  Fix filter rule when checking for apks in PRODUCT_COPY_FILES.
 2014-01-21 12:36:33 -08:00
Ying Wang 8d1f91fa54 Merge "Fix filter rule when checking for apks in PRODUCT_COPY_FILES." 2014-01-21 20:31:31 +00:00
Ying Wang 6e89ec9fb1 resolved conflicts for merge of 5f95f442 to master 
Change-Id: I498e37f711084a0f86f6dcb6dcd2d94ab8e1896d
 2014-01-21 12:17:11 -08:00
Ying Wang 5f95f44268 am 20048318: am aa754868: am 6ec35451: Merge "Add missing paren in "java -version" check" 
* commit '20048318cda49fc9412be8fb2349354313090240':
  Add missing paren in "java -version" check
 2014-01-21 20:01:29 +00:00
Ying Wang 20048318cd am aa754868: am 6ec35451: Merge "Add missing paren in "java -version" check" 
* commit 'aa7548683bcd254e50cffc5baf00994e58919d64':
  Add missing paren in "java -version" check
 2014-01-21 19:58:09 +00:00
Ying Wang aa7548683b am 6ec35451: Merge "Add missing paren in "java -version" check" 
* commit '6ec3545158f49f521c53c9474cfb28c1a1811fd3':
  Add missing paren in "java -version" check
 2014-01-21 11:54:58 -08:00
Ying Wang 6ec3545158 Merge "Add missing paren in "java -version" check" 2014-01-21 19:47:51 +00:00
Ying Wang 72b01d6121 Support to build executables for TARGET_2ND_ARCH 
By default, an executable is built for TARGET_ARCH.
To build it for TARGET_2ND_ARCH in a 64bit product, use:
LOCAL_32BIT_ONLY := true
To skip a module for TARGET_2ND_ARCH, use:
LOCAL_NO_2ND_ARCH := true

Bug: 11654773
Change-Id: Ieb293d25b21024bfe1b554044df338e064ac7b46
 2014-01-21 11:26:39 -08:00
Brian Carlstrom 0cf57dc99f Add missing paren in "java -version" check 
Change-Id: Id66e795423e8d25b48ac996956748a93060ea5db
 2014-01-20 23:48:45 -08:00
Robert Craig ca37190711 Fix filter rule when checking for apks in PRODUCT_COPY_FILES. 
PRODUCT_COPY_FILES entries can include the src:dest:owner
syntax versus src:dest. This causes the filter to miss
certain cases. Instead use the word-colon function to
grab the dest regardless of syntax.

Change-Id: I1f4e57a236c1db148bada0cfe5bd1e87bb1194d6
Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
 2014-01-17 09:13:50 -05:00
Ying Wang 084017e22c Replace all references to LOCAL_GENERATED_SOURCES with my_generated_sources 
Now the RS generated sources are only appended to my_generated_sources.

Bug: 11654773
Change-Id: If8dbf3c08fed0b9945dd32b8c809331c17c4bc85
 2014-01-16 16:21:03 -08:00
Ying Wang 791fa6a909 Set up rules to build shared libraries for TARGET_2ND_ARCH 
The rules for the 2nd arch are set up in the second inclusion
of shared_library_internal.mk.
Intermediate fils of libfoo of the 2nd arch will be built into
$(PRODUCT_OUT)/obj_$(TARGET_2ND_ARCH)/SHARED_LIBRARIES/libfoo_intermediates/
and the built libfoo.so will be in
$(PRODUCT_OUT)/obj_$(TARGET_2ND_ARCH)/lib.

Bug: 11654773
Change-Id: I58bbe5a05a65f63bce6279131552f3792000716e
 2014-01-16 15:43:47 -08:00
Ying Wang ef204edd5b Merge "Set up rules to build static libraries for TARGET_2ND_ARCH" 2014-01-16 23:25:04 +00:00
Ying Wang 8bcae01ac0 Merge "Load compiler environment for a second arch." 2014-01-16 23:24:41 +00:00
Ying Wang 61d499b965 Set up rules to build static libraries for TARGET_2ND_ARCH 
The rules for the 2nd arch are set up in the second inclusion
of static_library_internal.mk.
libfoo of the 2nd arch will be built into
$(PRODUCT_OUT)/obj_$(TARGET_2ND_ARCH)/libfoo_intermediates/libfoo.a.

Bug: 11654773
Change-Id: I1d92733968fc442e9225b4df5bd1b551a81d89f7
 2014-01-16 14:34:13 -08:00
Ying Wang e1d44c3b4a Load compiler environment for a second arch. 
This is the first step to build 32-bit libraries in a 64-bit product.
It will work like this:
1) In the product's BoardConfig.mk, define:
TARGET_2ND_ARCH, TARGET_2ND_ARCH_VARIANT, TARGET_2ND_CPU_VARIANT.
The build system uses those variables to set up an additional compiler
environment for the second arch.

2) When parsing Android.mks, the build system sets up rules to build a
module for both the 1st arch and the 2nd arch, unless it's explicitly
asked to skip so.
Android.mk will be adapted if there is additional rule of generating
source files.
The build system will accept arch-specific LOCAL_ variables, such as
LOCAL_CFLAGS_arm, LOCAL_CFLAGS_armv7-a-neon, LOCAL_CFLAGS_cortex-a15,
LOCAL_CFLAGS_aarch64 etc. Modules use such variables to set up build for
various archs at the same time.

3) Install binary of the 2nd arch by adding "<module_name>:32" to
PRODUCT_PACKAGES. All 2nd-arch libraries linked in by "<module_name>:32"
will be installed automatically.

Bug: 11654773
Change-Id: I2df63cd5463a07bf5358bee2a109f8fb9590fe30
 2014-01-16 14:30:02 -08:00
Doug Zongker 00aba87b7b add the uncrypt binary to device builds 
The uncrypt binary needs to be present on any device which reboots
into recovery.

Change-Id: I684a279484876e8a596829e41218095a793ea26b
 2014-01-16 12:45:21 -08:00
Chet Haase c888b4f9b6 am 585ce19d: Add recyclerview to support libs docs 
* commit '585ce19d9d6b9feac75baa646b507dbd35085f7c':
  Add recyclerview to support libs docs
 2014-01-16 17:55:15 +00:00
Chet Haase 585ce19d9d Add recyclerview to support libs docs 
Change-Id: Ibe863e4b1930670353e6e0658fbc83e694dec3a4
 2014-01-16 15:55:56 +00:00
Ying Wang 2f68fddd07 am 4339ad4a: am da9ef76b: am a296a71e: am 166bc090: Merge "[MIPS] Reenable linker fatal-warnings" 
* commit '4339ad4ac1e0170c7c7497c2b3480b2154fcd8ac':
  [MIPS] Reenable linker fatal-warnings
 2014-01-16 01:17:22 +00:00
Ying Wang 4339ad4ac1 am da9ef76b: am a296a71e: am 166bc090: Merge "[MIPS] Reenable linker fatal-warnings" 
* commit 'da9ef76b5d66053edccd946dc93dd4134b2c9e29':
  [MIPS] Reenable linker fatal-warnings
 2014-01-16 01:14:11 +00:00
Ying Wang da9ef76b5d am a296a71e: am 166bc090: Merge "[MIPS] Reenable linker fatal-warnings" 
* commit 'a296a71e0c344e95f2d4dfe59d850a55130fe58a':
  [MIPS] Reenable linker fatal-warnings
 2014-01-16 01:11:15 +00:00
Ying Wang a296a71e0c am 166bc090: Merge "[MIPS] Reenable linker fatal-warnings" 
* commit '166bc090ab0ac7ac7a620889fd96656be4ca69c1':
  [MIPS] Reenable linker fatal-warnings
 2014-01-15 17:08:22 -08:00
Ying Wang 166bc090ab Merge "[MIPS] Reenable linker fatal-warnings" 2014-01-16 01:02:58 +00:00
Chris Dearman 13eb1eb53d [MIPS] Reenable linker fatal-warnings 
Change-Id: I4efbb7d0b1026b49a9b8bf968dd4752fca8a543b
 2014-01-15 19:00:37 +00:00
Ben Cheng 033aeb8630 am cbb9c761: am 27c9f861: am 1703474f: am 365e4439: Merge "Add aosp_aarch64-eng to the default lunch menu." 
* commit 'cbb9c76174f4da90d5311f75f808c9b570dc5bc8':
  Add aosp_aarch64-eng to the default lunch menu.
 2014-01-15 00:18:11 +00:00
Ben Cheng cbb9c76174 am 27c9f861: am 1703474f: am 365e4439: Merge "Add aosp_aarch64-eng to the default lunch menu." 
* commit '27c9f861028a23300d5d27f73be5be36247e0569':
  Add aosp_aarch64-eng to the default lunch menu.
 2014-01-15 00:14:56 +00:00
Ben Cheng 27c9f86102 am 1703474f: am 365e4439: Merge "Add aosp_aarch64-eng to the default lunch menu." 
* commit '1703474f4ce5510b10f43babc8afba553013c90b':
  Add aosp_aarch64-eng to the default lunch menu.
 2014-01-15 00:12:02 +00:00
Ben Cheng 1703474f4c am 365e4439: Merge "Add aosp_aarch64-eng to the default lunch menu." 
* commit '365e443995b2b33eae23ff0423a042eb52e64326':
  Add aosp_aarch64-eng to the default lunch menu.
 2014-01-14 16:08:43 -08:00
Ben Cheng 365e443995 Merge "Add aosp_aarch64-eng to the default lunch menu." 2014-01-15 00:01:12 +00:00
Ben Cheng 89ccc4895d Add aosp_aarch64-eng to the default lunch menu. 
Change-Id: I55f6ab6ea90670def30796fdce76c27031ecef01
 2014-01-14 15:55:03 -08:00
Ying Wang bf39ddab4c am e6036aa6: am c4f4a532: am 14af5526: am c4c71f06: Merge "Remove aprof support from the build system." 
* commit 'e6036aa6ff8cde9fad959ed42bec8cce0350c5e6':
  Remove aprof support from the build system.
 2014-01-14 23:47:11 +00:00
Ying Wang e6036aa6ff am c4f4a532: am 14af5526: am c4c71f06: Merge "Remove aprof support from the build system." 
* commit 'c4f4a5325f1d5ed00a84b7163b0a03d607a33684':
  Remove aprof support from the build system.
 2014-01-14 23:45:09 +00:00
Ying Wang c4f4a5325f am 14af5526: am c4c71f06: Merge "Remove aprof support from the build system." 
* commit '14af5526b5001431af49e40be049b5475de64f15':
  Remove aprof support from the build system.
 2014-01-14 23:42:33 +00:00
Ying Wang 14af5526b5 am c4c71f06: Merge "Remove aprof support from the build system." 
* commit 'c4c71f06ab002c4b12042ba7752272311b62b0f9':
  Remove aprof support from the build system.
 2014-01-14 15:36:57 -08:00
Ying Wang c4c71f06ab Merge "Remove aprof support from the build system." 2014-01-14 23:33:35 +00:00
Ying Wang 4587455075 Remove aprof support from the build system. 
This reverts the commit 70dc3e1d.

Change-Id: I480b005579805d2608d05dac41e32bb44642e813
 2014-01-14 14:26:05 -08:00
Ying Wang 734afe4e42 am 94ff79ea: am adc66128: am b6c57051: am f5ce4fa9: Merge "Install 64-bit libraries to /system/lib64." 
* commit '94ff79eaf2d66be4c83656a41b4efa38ad34a970':
  Install 64-bit libraries to /system/lib64.
 2014-01-14 20:15:45 +00:00