tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
11483 commits 1 branch 0 tags 119 MiB
Commit graph

2850 commits

Author SHA1 Message Date
Zhihai Xu
d81b9d220e Merge "ISSUE 6849488 Bluedroid stack, remove system/bluetooth." into jb-mr1-dev 2012-09-20 16:42:47 -07:00
Ying Wang
4b0486b4a6 Allow to tag owner to PRODUCT_COPY_FILES 
PRODUCT_COPY_FILES now is a list of words like <source
path>:<destination path>[:<owner>].
The optional :<owner> is used to indicate the owner of a vendor file.

Bug: 7048854
Change-Id: I435d1e18b7a091fb62513062cfc2e420e51557ec
 2012-09-20 16:37:55 -07:00
Ying Wang
d6ff065b69 am a49a4d34: am 7884dfc6: Merge "Move AndroidConfig.h from system/core to the build project." into jb-mr1-dev 
* commit 'a49a4d3461fba91e9da0049863f812ddb8ffc8e2':
  Move AndroidConfig.h from system/core to the build project.
 2012-09-20 15:46:06 -07:00
Zhihai Xu
3849760809 ISSUE 6849488 Bluedroid stack, remove system/bluetooth. 
remove system/bluetooth stuff.

bug 6849488
Change-Id: I8eb85c6da0aa34aefda2916f2c74e5eae51da27e
 2012-09-20 10:50:56 -07:00
Ying Wang
5bdf305bbe Move AndroidConfig.h from system/core to the build project. 
So unbundled branches don't need to include the system/core project.

Change-Id: Ic4ef62ee6df069b9b2dd123aed95a3e7fcdfc146
 2012-09-20 10:33:20 -07:00
Jean-Baptiste Queru
a068907570 Update version number for AOSP master 
Change-Id: I5bc11420932d62a2f6bc12410fe7c8ac2dca069b
 2012-09-14 07:43:41 -07:00
Andrew Hsieh
907e1b7ffa am feec779e: am 5630521a: resolved conflicts for merge of 3e91f5ad to jb-mr1-dev 
* commit 'feec779ef44f5127b2da851823d840f3dbe9c931':
  Enable stack-protector for x86
 2012-09-12 17:03:41 -07:00
Benoit Goby
4b0c7230e6 am a52d50a2: am 063d0c5d: Merge "Add openssl to TINY_ANDROID build" into jb-mr1-dev 
* commit 'a52d50a235d07229ade4595e0551c1b0409c23be':
  Add openssl to TINY_ANDROID build
 2012-09-12 17:03:31 -07:00
Andrew Hsieh
5630521aba resolved conflicts for merge of 3e91f5ad to jb-mr1-dev 
Change-Id: I9b587bc6086e1edacc98879e43668001bf72f7db
 2012-09-12 15:27:59 -07:00
Andrew Hsieh
0f47a94d2e am 7e300d60: Merge "Enable stack-protector for x86" 
* commit '7e300d60bfc325e3cbf3e7656297c14109e513b8':
  Enable stack-protector for x86
 2012-09-12 14:20:11 -07:00
Andrew Hsieh
7e300d60bf Merge "Enable stack-protector for x86" 2012-09-12 13:44:01 -07:00
Benoit Goby
bc2406e64c Add openssl to TINY_ANDROID build 
adb depends on it

Change-Id: I79f23315142b45bc7f9a2685fa2b9865b22396ad
 2012-09-11 17:25:05 -07:00
Ying Wang
6a6723a0a9 am 4458452e: Merge "android.core.vm-tests-tf.jar path changed to HOST JAVA_LIBRARIES." 
* commit '4458452ef64f271906914e79ffd9923630ae22f2':
  android.core.vm-tests-tf.jar path changed to HOST JAVA_LIBRARIES.
 2012-09-11 12:12:23 -07:00
Ying Wang
6adcf0180a android.core.vm-tests-tf.jar path changed to HOST JAVA_LIBRARIES. 
Bug: 7019588
Change-Id: I6406110071d891e27df6d1cc562a7baa884b2e9e
 2012-09-11 11:47:22 -07:00
Ying Wang
d43fbfe783 am 23755396: am 55861069: am 4595d7d6: am 410420ed: am 9efa5bae: Merge "Add transform-d-to-p-args" 
* commit '23755396f5c1d62103c8a6930e1bad63d26189f6':
  Add transform-d-to-p-args
 2012-09-10 17:14:21 -07:00
Ying Wang
5586106944 am 4595d7d6: am 410420ed: am 9efa5bae: Merge "Add transform-d-to-p-args" 
* commit '4595d7d62c0d594aa3501e4f547563348a3a5eb0':
  Add transform-d-to-p-args
 2012-09-10 10:25:41 -07:00
Ying Wang
410420ed66 am 9efa5bae: Merge "Add transform-d-to-p-args" 
* commit '9efa5bae8645988a0d24af14142df9572bf7bd57':
  Add transform-d-to-p-args
 2012-09-10 10:21:57 -07:00
Ying Wang
c23f4efdbb Add transform-d-to-p-args 
This new indirection allows us too to output .P files when we are
generating non-.o files, such as .s or .S files.
Bug: 7127743

Change-Id: I9e46c417031764fefc9909ba4a3eb63885f34f9e
 2012-09-07 17:04:06 -07:00
Ying Wang
2594b9f2d9 am 2790ff11: am 76766114: am 19c06156: am 0ee362ea: am 478d0fc6: Merge "Remove duplicate src:dest pairs in PRODUCT_COPY_FILES" 
* commit '2790ff11ec80345d3553b97ba57dd4225e563ac7':
  Remove duplicate src:dest pairs in PRODUCT_COPY_FILES
 2012-09-05 18:44:02 -07:00
Ying Wang
7676611415 am 19c06156: am 0ee362ea: am 478d0fc6: Merge "Remove duplicate src:dest pairs in PRODUCT_COPY_FILES" 
* commit '19c06156b6615ba53d81d2ecdc341c3feea21662':
  Remove duplicate src:dest pairs in PRODUCT_COPY_FILES
 2012-09-05 18:39:55 -07:00
Ying Wang
0ee362ea04 am 478d0fc6: Merge "Remove duplicate src:dest pairs in PRODUCT_COPY_FILES" 
* commit '478d0fc6a311b236fddc9d18c9a1b922f8ecf1ea':
  Remove duplicate src:dest pairs in PRODUCT_COPY_FILES
 2012-09-05 18:35:50 -07:00
Ying Wang
619fccf9f3 Remove duplicate src:dest pairs in PRODUCT_COPY_FILES 
Before setting up the rules.

Change-Id: Ifedbc0e988895a899cae315dc730a152bae91ae2
 2012-09-05 18:09:49 -07:00
Doug Zongker
37c9f9dca8 am 037922ab: am 821a54a0: Merge "fix possible build break" into jb-mr1-dev 
* commit '037922abb5a1a3449f80edfe41ca2d66453d00fb':
  fix possible build break
 2012-09-04 14:53:25 -07:00
Doug Zongker
1a09726f68 fix possible build break 
If you try to build a recovery image without having built the main
system, creating the recovery resourc file can fail due to the
directory not existing.

Change-Id: I2daff847c0b58dfa519d0f742636f01dba28c689
 2012-09-04 14:45:11 -07:00
Ying Wang
fb12f71fe7 am 18c8d9eb: am 3a6f7589: Add LOCAL_DONT_DELETE_JAR_META_INF 
* commit '18c8d9eb1e0c0776862d554f0834e7ee3018375a':
  Add LOCAL_DONT_DELETE_JAR_META_INF
 2012-08-30 14:16:31 -07:00
Ying Wang
3a6f7589e8 Add LOCAL_DONT_DELETE_JAR_META_INF 
To support to not delete META_INF directory from the static Java
libraries.

Change-Id: I720bfa059c43dd457a74a0c60bb6797aa408ecaf
 2012-08-30 12:59:42 -07:00
Andrew Hsieh
c2fb2391f4 Enable stack-protector for x86 
Change-Id: I7a169075ca49ab831c37625d416c1d4b026bfec3
 2012-08-29 15:13:23 +08:00
Jean-Baptiste Queru
f3ca2f3507 am 68d43bfd: am d4ace138: am 4dc6ed96: am 9eb87b8d: Merge "Add pattern to check for GCC 4.6" 
* commit '68d43bfd402a2dc63da91846972262fd3150d3d4':
  Add pattern to check for GCC 4.6
 2012-08-28 13:44:05 -07:00
Jean-Baptiste Queru
3ddaa04cb3 am 2c83b090: am d5096c6a: resolved conflicts for merge of 5c903372 to jb-mr1-dev 
* commit '2c83b09034d5be5369168697eab3e825ef13610d':
  Use gold linker on x86
 2012-08-28 13:44:03 -07:00
Jean-Baptiste Queru
d4ace13802 am 4dc6ed96: am 9eb87b8d: Merge "Add pattern to check for GCC 4.6" 
* commit '4dc6ed96a0612d4693cca5ed5674873754bcb37e':
  Add pattern to check for GCC 4.6
 2012-08-28 13:41:09 -07:00
Jean-Baptiste Queru
d5096c6a5c resolved conflicts for merge of 5c903372 to jb-mr1-dev 
Change-Id: I4994c77a6570ce654915bfb8c5f6ee4583db86b7
 2012-08-28 13:40:19 -07:00
Jean-Baptiste Queru
4dc6ed96a0 am 9eb87b8d: Merge "Add pattern to check for GCC 4.6" 
* commit '9eb87b8d2011e65462ea42de6899158cd35a492a':
  Add pattern to check for GCC 4.6
 2012-08-28 13:16:59 -07:00
Jean-Baptiste Queru
5c90337229 am 9e2b4718: Merge "Use gold linker on x86" 
* commit '9e2b4718a0e11a723904ba205a5156bae450be30':
  Use gold linker on x86
 2012-08-28 13:16:57 -07:00
Jean-Baptiste Queru
9eb87b8d20 Merge "Add pattern to check for GCC 4.6" 2012-08-28 12:47:34 -07:00
Ying Wang
6f4de4bd13 Allow Java resource in apk. 
Bug: 6892294
Change-Id: Ib7664e3d9e396dc8ccccecbae9103884014f3ddd
 2012-08-28 12:37:27 -07:00
Jean-Baptiste Queru
9e2b4718a0 Merge "Use gold linker on x86" 2012-08-28 12:27:21 -07:00
Evgeniy Stepanov
e1d27e210f Split out ASFLAGS from CFLAGS in Clang config. 
Change-Id: I4e3fc3c737fd7c1baff7e30f01d2b26bda557f71
 2012-08-28 10:08:24 -07:00
Pavel Chupin
b205b46153 Use gold linker on x86 
Patch removes fallback -fuse-ld=bfd for x86 target and
--copy-dt-needed-entries which is not supported by gold linker.

Change-Id: Ie5603f98e3f2f9d4f81678c718e39b130a75d057
Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com>
 2012-08-28 13:10:18 +04:00
Andrew Hsieh
26c7805781 Add pattern to check for GCC 4.6 
GCC 4.6 --version can return 4.6.x-google but also simply 4.6
as of https://android-review.googlesource.com/#/c/42028.
Add more pattern to detect it.

Change-Id: Ibf34fba9afdf01bd3eafc011cc4d059b59f25d3d
 2012-08-28 10:49:05 +08:00
Ying Wang
8cd3113ee8 am 94aa427b: am 24559290: Keep the emma classes if emma is enabled. 
* commit '94aa427bc0c2893738e8d12f041f68490515517f':
  Keep the emma classes if emma is enabled.
 2012-08-27 16:21:28 -07:00
Ying Wang
245592908c Keep the emma classes if emma is enabled. 
Change-Id: Ie551d48532c61bf610b12875dc33cfe476625c5e
 2012-08-27 16:10:28 -07:00
Ying Wang
3e500c6356 Automatically add Java resources carried by static Java libraries. 
Bug: 6892294
Change-Id: I3ff71ee3d7b9ccdfde6a5284cc350864fbffa71f

Conflicts:

	core/package.mk
 2012-08-27 15:21:51 -07:00
Ben Cheng
50ad303126 am 0419b446: am 4df0782b: Merge "Define the proper macro "GTEST_OS_LINUX_ANDROID" for native tests." into jb-mr1-dev 
* commit '0419b446598f0c3cbf46ef2f2973e043338ac988':
  Define the proper macro "GTEST_OS_LINUX_ANDROID" for native tests.
 2012-08-27 12:32:32 -07:00
Ben Cheng
4df0782b3a Merge "Define the proper macro "GTEST_OS_LINUX_ANDROID" for native tests." into jb-mr1-dev 2012-08-27 12:27:37 -07:00
Ben Cheng
cc4822682e Define the proper macro "GTEST_OS_LINUX_ANDROID" for native tests. 
Bug 7050760

Change-Id: I05e69b741eaf628ab1d25dec12a953f9f2a3d9a2
 2012-08-27 12:20:36 -07:00
Jean-Baptiste Queru
a02f5b9463 am 5cbda9a8: am 414d7e85: am dbf6ad06: am 713bac96: Merge "ARM: put crtbegin_so.o at the beginning where it belongs" 
* commit '5cbda9a80c23125ac1fa7d722d948fd59a79f793':
  ARM: put crtbegin_so.o at the beginning where it belongs
 2012-08-24 14:19:18 -07:00
Jean-Baptiste Queru
414d7e859a am dbf6ad06: am 713bac96: Merge "ARM: put crtbegin_so.o at the beginning where it belongs" 
* commit 'dbf6ad0692f98cacf27dc023854b2c5a5575a841':
  ARM: put crtbegin_so.o at the beginning where it belongs
 2012-08-24 13:06:42 -07:00
Jean-Baptiste Queru
dbf6ad0692 am 713bac96: Merge "ARM: put crtbegin_so.o at the beginning where it belongs" 
* commit '713bac96d628d6ca040fb1fe5d7a8abdcb932553':
  ARM: put crtbegin_so.o at the beginning where it belongs
 2012-08-24 13:04:48 -07:00
Jean-Baptiste Queru
713bac96d6 Merge "ARM: put crtbegin_so.o at the beginning where it belongs" 2012-08-24 13:00:10 -07:00
Ying Wang
dceb47f2e2 am 4084c112: am 2d39468b: Merge "Filter out the overridden packages before doing required module expansion." into jb-mr1-dev 
* commit '4084c112e5d073bd0d6875c45939ed7fba62ed14':
  Filter out the overridden packages before doing required module expansion.
 2012-08-24 09:55:05 -07:00
Ying Wang
489458fa31 Filter out the overridden packages before doing required module expansion. 
Bug: 6900954
Change-Id: Ib0f57dc4bfc341ec7166429a5bb71bfc5e28d271
 2012-08-23 15:08:34 -07:00
Ying Wang
3ea0a81c2b am d19511a6: am c3a4cfe9: Merge "Support EMMA_INSTRUMENT in both full and unbundled builds." into jb-mr1-dev 
* commit 'd19511a6657efc7f1a7e544df04f076223f8fe65':
  Support EMMA_INSTRUMENT in both full and unbundled builds.
 2012-08-22 15:27:37 -07:00
Ying Wang
c3a4cfe9b5 Merge "Support EMMA_INSTRUMENT in both full and unbundled builds." into jb-mr1-dev 2012-08-22 15:19:28 -07:00
Ying Wang
af4800c8a6 Support EMMA_INSTRUMENT in both full and unbundled builds. 
Bug: 6987838
- With this change, use "EMMA_INSTRUMENT=true" to enable emma in full or
  unbundled build.
- You don't need to add "LOCAL_STATIC_JAVA_LIBRARIES += emma" any more for
  unbundled apps.
- Now a single var LOCAL_EMMA_INSTRUMENT replaces the previous
  LOCAL_NO_EMMA_INSTRUMENT and LOCAL_NO_EMMA_COMPILE.
- By default, if EMMA_INSTRUMENT is true, emma is enabled for only
  non-test apps.
- A new global var EMMA_INSTRUMENT_STATIC. It enables EMMA_INSTRUMENT
  and builds emma into apk/jar as static library, instead of using emma
  as part of shared library core.jar.

Change-Id: I0aa219e83074879ececc159b5b07c39eb07ccc00
 2012-08-22 12:11:01 -07:00
Jean-Baptiste Queru
eb08c613fd am abe04492: am cd9668ed: am e3479ea5: am 15012c11: Merge "Build on Mac OS X : add experimental SDK versions" 
* commit 'abe0449287b8d7ab5066c579a5dd4263940499ab':
  Build on Mac OS X : add experimental SDK versions
 2012-08-22 10:00:37 -07:00
Jean-Baptiste Queru
cd9668edd4 am e3479ea5: am 15012c11: Merge "Build on Mac OS X : add experimental SDK versions" 
* commit 'e3479ea5033e2ede36f6f771dd3a6ea315505efd':
  Build on Mac OS X : add experimental SDK versions
 2012-08-22 09:57:30 -07:00
Jean-Baptiste Queru
e3479ea503 am 15012c11: Merge "Build on Mac OS X : add experimental SDK versions" 
* commit '15012c115dca7bc0d2edd8dd2689117546b1360e':
  Build on Mac OS X : add experimental SDK versions
 2012-08-22 09:55:25 -07:00
Jean-Baptiste Queru
15012c115d Merge "Build on Mac OS X : add experimental SDK versions" 2012-08-22 09:44:48 -07:00
Ying Wang
0ae743664b am 9ad6a1c5: am b3f83098: Merge "android.core.vm-tests-tf.jar path changed to HOST JAVA_LIBRARIES." into jb-mr1-dev 
* commit '9ad6a1c512bf0280c9db9e6f3f5b575fa9acf768':
  android.core.vm-tests-tf.jar path changed to HOST JAVA_LIBRARIES.
 2012-08-21 13:49:44 -07:00
Ying Wang
b3f83098ef Merge "android.core.vm-tests-tf.jar path changed to HOST JAVA_LIBRARIES." into jb-mr1-dev 2012-08-21 13:45:38 -07:00
Andrew Hsieh
cd3050c541 am 4d69e06b: Merge "Added BUILD_HOST_static to build statically linked executable/shared-lib" 
* commit '4d69e06b764d030dcc3ce9bc8b103a75eff3175a':
  Added BUILD_HOST_static to build statically linked executable/shared-lib
 2012-08-21 12:58:45 -07:00
Ying Wang
02d75da447 android.core.vm-tests-tf.jar path changed to HOST JAVA_LIBRARIES. 
Bug: 7019588
Change-Id: I6406110071d891e27df6d1cc562a7baa884b2e9e
 2012-08-21 11:54:49 -07:00
Keun young Park
8b40446646 am 5b2fb5e6: am 10c2ef5c: Merge "change target to androideabi" into jb-mr1-dev 
* commit '5b2fb5e6621e9375901fef04391dc15b2b98fcf6':
  change target to androideabi
 2012-08-21 11:26:12 -07:00
SangWook Han
691e0243ca Build on Mac OS X : add experimental SDK versions 
Change-Id: Ifc67d1745e72fc048cd6e8c8ef0521ab92468086
 2012-08-22 02:59:58 +09:00
Keun young Park
02a2f848b6 change target to androideabi 
- it should be androideabi instead of android
  external/llvm/lib/Support/Triple.cpp

Change-Id: Ied50f2dba930b402d000b5eb3b3ce5ef20731b8b
 2012-08-21 10:20:18 -07:00
Ard Biesheuvel
6c1f9ccfb1 ARM: put crtbegin_so.o at the beginning where it belongs 
Change-Id: I9466fe9277c58a7b8f8a9964b2d578a65e579995
 2012-08-21 10:42:32 +02:00
Andrew Hsieh
31ef1037bf Added BUILD_HOST_static to build statically linked executable/shared-lib 
Statically linked executable/shared-lib (eg. SDK tools) are useful
in sandboxed environment.

In BUILD_HOST_static zipalign needs -lpthread indirectly:
zipalign->libutils.a->liblog.a->logd_write.c->pthread

Change-Id: I615f574e918c83ed1ab82db2453b69d0420cb59c
 2012-08-21 14:40:16 +08:00
Doug Zongker
a7b3e66f28 am 7a4e83b2: am 85e86626: Merge "include recovery-resource.dat in /system/etc" into jb-mr1-dev 
* commit '7a4e83b235aeec6036440cb3b86311418f2e8c25':
  include recovery-resource.dat in /system/etc
 2012-08-20 15:50:18 -07:00
Doug Zongker
85e86626e9 Merge "include recovery-resource.dat in /system/etc" into jb-mr1-dev 2012-08-20 15:47:07 -07:00
Doug Zongker
565888726b include recovery-resource.dat in /system/etc 
Put the recovery UI images into a file in /system/etc where we can use
them for constructing the recovery image, so they don't need to be
included in OTA packages.

Change-Id: Iab2144865298c8967eb31660abd3bb11e6ec26fa
 2012-08-20 15:38:58 -07:00
Keun young Park
07720fd5d3 am 28066de6: am 397d2edb: Merge "add CLANG configurations for MIPS" into jb-mr1-dev 
* commit '28066de6a34e39e635a88f4e6f876f2f643e5dd7':
  add CLANG configurations for MIPS
 2012-08-20 09:45:04 -07:00
Keun young Park
397d2edbb9 Merge "add CLANG configurations for MIPS" into jb-mr1-dev 2012-08-20 09:36:11 -07:00
Andreas Makris
ce7731af9f Add BOARD_CUSTOM_BOOTIMG_MK for custom bootimg building 
This patch adds BOARD_CUSTOM_BOOTIMG_MK. It is needed for some devices like
Sony Xperia S (LT26) because it needs a own bootimg format.
If BOARD_CUSTOM_BOOTIMG_MK is not set the build will be done in the normal
way, so other devices are not affected.

Change-Id: I66c8be6b107988d3238001e1dc612c044ed01aaa
Signed-off-by: Andreas Makris <andreas.makris@gmail.com>
 2012-08-18 18:36:11 +02:00
Joe Onorato
5ad1d7ec00 am 726d921a: am 45cd00cd: Merge "Install all host modules. Don\'t filter out ones tagged "optional"" 
* commit '726d921a47cb1003bcf7ff84ae1d332dec86d674':
  Install all host modules.  Don't filter out ones tagged "optional"
 2012-08-17 05:46:29 -07:00
Joe Onorato
726d921a47 am 45cd00cd: Merge "Install all host modules. Don\'t filter out ones tagged "optional"" 
* commit '45cd00cd9e2feec187a6253b95e866cd10dfa20a':
  Install all host modules.  Don't filter out ones tagged "optional"
 2012-08-17 05:43:43 -07:00
Joe Onorato
45cd00cd9e Merge "Install all host modules. Don't filter out ones tagged "optional"" 2012-08-17 05:36:21 -07:00
Joe Onorato
68559da02f Install all host modules. Don't filter out ones tagged "optional" 
Change-Id: I9b3a27a4c84ee748314e98603670eb939ae949e2
 2012-08-17 05:35:23 -07:00
Joe Onorato
2d560de09c am fec412ed: am b68c3f9c: am 763c0801: am 687bde38: Merge "Add all the host tools to the list of prerequisites for the SDK." 
* commit 'fec412ed3fe1b48928393ec14520a492fa2becba':
  Add all the host tools to the list of prerequisites for the SDK.
 2012-08-17 05:23:05 -07:00
Joe Onorato
b68c3f9ca5 am 763c0801: am 687bde38: Merge "Add all the host tools to the list of prerequisites for the SDK." 
* commit '763c080198655782cc5700d6f53cce330ab7e008':
  Add all the host tools to the list of prerequisites for the SDK.
 2012-08-17 05:08:36 -07:00
Joe Onorato
763c080198 am 687bde38: Merge "Add all the host tools to the list of prerequisites for the SDK." 
* commit '687bde38891b6aa3796f52721d7498436ab45330':
  Add all the host tools to the list of prerequisites for the SDK.
 2012-08-17 04:34:06 -07:00
Joe Onorato
63d56dad65 Add all the host tools to the list of prerequisites for the SDK. 
Change-Id: I3a3e4be8796f761119e29f3be64ad534e48c95ee
 2012-08-17 04:19:38 -07:00
Joe Onorato
769239f299 resolved conflicts for merge of 34539244 to master 
Change-Id: I55b5c4aea999ff3fb5ceaabfe5d658a296f3d971
 2012-08-17 02:51:45 -07:00
Joe Onorato
c5fbef5413 resolved conflicts for merge of fab83a3d to jb-mr1-dev 
Change-Id: I97aff2be317fd10b68d933e65259ec48bd5ff6a1
 2012-08-17 01:26:41 -07:00
Joe Onorato
fab83a3d62 am 3b4b11a4: Merge "Another error to warning" 
* commit '3b4b11a4701b64df5248e7d86c0c357954a2ca10':
  Another error to warning
 2012-08-17 01:22:31 -07:00
Joe Onorato
0ee86a7429 Another error to warning 
Change-Id: Ifbad63e3eb37d087d88a39e102b4239f305d0ee3
 2012-08-17 01:12:27 -07:00
Joe Onorato
5956db9394 am 6b340ad0: am 7c945d24: Merge "Make error a warning for now" 
* commit '6b340ad06c90ad80894bce720075e05f31b8f4cb':
  Make error a warning for now
 2012-08-17 00:47:42 -07:00
Joe Onorato
6b340ad06c am 7c945d24: Merge "Make error a warning for now" 
* commit '7c945d249956ed3943585b8d417a51a598b175b3':
  Make error a warning for now
 2012-08-17 00:46:36 -07:00
Joe Onorato
c31be8f8f2 Make error a warning for now 
Change-Id: I156fb70432cf546650bf11d03a4edc118c665c1c
 2012-08-17 00:46:17 -07:00
Joe Onorato
aa816333ae Make error a warning for now 
Change-Id: Idf18957fff2bb4ff31ca6d7d8d1c8d95847b4e00
 2012-08-17 00:36:00 -07:00
Joe Onorato
cea08a5220 resolved conflicts for merge of 5836d3b3 to jb-mr1-dev 
Change-Id: If3d84a7439717ccf7723b3f79e934d73abbb3fea
 2012-08-17 00:09:27 -07:00
Joe Onorato
5836d3b3d9 am f72e34eb: Merge changes I9d3a3c16,I17b5d441,I29e27505,Ia5ca233e,I0a0b200b,I6f412ed4,I623821df,Ifec8e63e,I12d0a847,Idac551e5,I59a88027,I2498139d,I6bd93a87 
* commit 'f72e34ebf49ed2a06fe9e37d134f2088e2c0c0e4':
  Move the old user tagged modules over to base.mk so mini and core both share them.
  More product debugging.
  build system changes for jb-aah-dev merge
  Fail when a non-vendor product references a vendor module.
  Remove support for user tags in the build system.
  List the user modules explicitly, and we can get rid of the support for the user tag!
  Dump the user tagged modules.
  host modules don't need LOCAL_MODULE_TAGS
  Don't give the user tag to host modules automatically.
  Add a phony "nothing" goal that reads the makefiles but doesn't try to build anything.
  Add tool to parse make dependency info from new --deps flag.
  Use a more modern -j flag.
  make product-graph now filtered
 2012-08-16 23:50:34 -07:00
Joe Onorato
175f2e0b43 Automatically install all host modules. 
Change-Id: Ifa9cd19e6c17c5ce1f9a25965155194c16926871
 2012-08-16 22:45:57 -07:00
Joe Onorato
3d48122b18 Make the error message for usless tags a little more helpful 
Change-Id: I1c6edd260280d5bab03b0d4c1e49f1bbecfd1a53
 2012-08-16 22:45:56 -07:00
Joe Onorato
88155422f2 More product debugging. 
Change-Id: I17b5d441e44ea39564263b32f963e2d3ac684232
 2012-08-16 22:45:56 -07:00
Joe Onorato
8d0847e924 build system changes for jb-aah-dev merge 
Change-Id: I29e27505a0d9f7cc2932f725bfe1c83d804388bc
 2012-08-16 22:45:56 -07:00
Joe Onorato
e213944da4 Fail when a non-vendor product references a vendor module. 
Change-Id: Ia5ca233e9b11f64b72074f65899d3041cf955c4c
 2012-08-16 22:45:56 -07:00
Joe Onorato
6a185e453d Remove support for user tags in the build system. 
It is not forbidden to say LOCAL_MODULE_TAGS := user,
and if you don't say LOCAL_MODULE_TAGS, it now defaults
to optional.

Change-Id: I0a0b200bb6f1c7bf1fe3a89cdc8f69678617526c
 2012-08-16 22:45:56 -07:00
Joe Onorato
f93f5be23e Dump the user tagged modules. 
Change-Id: I623821df3e48b358a6b898ccb13750f7dc54ddcf
 2012-08-16 22:45:56 -07:00
Joe Onorato
918ee311f5 Don't give the user tag to host modules automatically. 
Change-Id: I12d0a84786e5bf2224efd8684526b6097e6105d7
 2012-08-16 22:45:55 -07:00
Joe Onorato
10649c632d Add a phony "nothing" goal that reads the makefiles but doesn't try to build anything. 
Change-Id: Idac551e5c796321e993b94761f5cbf5b55c1a994
 2012-08-16 22:45:55 -07:00
Joe Onorato
8b46e302e6 make product-graph now filtered 
Change-Id: I6bd93a87902e20a24c1c58152fb578ef1f4cb208
 2012-08-16 22:45:55 -07:00
Joe Onorato
f3319452ad More product debugging. 
Change-Id: I17b5d441e44ea39564263b32f963e2d3ac684232
 2012-08-16 22:36:41 -07:00
Joe Onorato
26ead966d7 build system changes for jb-aah-dev merge 
Change-Id: I29e27505a0d9f7cc2932f725bfe1c83d804388bc
 2012-08-16 22:36:41 -07:00
Joe Onorato
75493610b3 Fail when a non-vendor product references a vendor module. 
Change-Id: Ia5ca233e9b11f64b72074f65899d3041cf955c4c
 2012-08-16 22:36:41 -07:00
Joe Onorato
529302d912 Remove support for user tags in the build system. 
It is not forbidden to say LOCAL_MODULE_TAGS := user,
and if you don't say LOCAL_MODULE_TAGS, it now defaults
to optional.

Change-Id: I0a0b200bb6f1c7bf1fe3a89cdc8f69678617526c
 2012-08-16 22:36:41 -07:00
Joe Onorato
d23c3235fa Dump the user tagged modules. 
Change-Id: I623821df3e48b358a6b898ccb13750f7dc54ddcf
 2012-08-16 22:36:40 -07:00
Joe Onorato
f85cb7c936 Don't give the user tag to host modules automatically. 
Change-Id: I12d0a84786e5bf2224efd8684526b6097e6105d7
 2012-08-16 22:36:40 -07:00
Joe Onorato
d6b1d628be Add a phony "nothing" goal that reads the makefiles but doesn't try to build anything. 
Change-Id: Idac551e5c796321e993b94761f5cbf5b55c1a994
 2012-08-16 22:36:40 -07:00
Joe Onorato
f5debbfee6 make product-graph now filtered 
Change-Id: I6bd93a87902e20a24c1c58152fb578ef1f4cb208
 2012-08-16 22:36:40 -07:00
Ying Wang
3eea132abf am 88ed4fb1: am 732b2ba7: Merge "Don\'t include system/core/include/arch/<arch>/Android.mk for apps-only build." into jb-mr1-dev 
* commit '88ed4fb1f3456d6fec4df87a56d66a5c58e2f0d8':
  Don't include system/core/include/arch/<arch>/Android.mk for apps-only build.
 2012-08-16 16:53:39 -07:00
Ying Wang
732b2ba79a Merge "Don't include system/core/include/arch/<arch>/Android.mk for apps-only build." into jb-mr1-dev 2012-08-16 16:51:00 -07:00
Ying Wang
da4bf42514 Don't include system/core/include/arch/<arch>/Android.mk for apps-only build. 
Bug: 6994483
Change-Id: I76c4d96264cf94a79d59fdeb52bb37c07a9458dd
 2012-08-16 16:45:01 -07:00
Keun young Park
6e86a57b0f add CLANG configurations for MIPS 
Change-Id: I36ed8089c447c20c229c348a096b49ff126552de
 2012-08-16 16:28:04 -07:00
Jean-Baptiste Queru
c11108b721 am b2b42bcd: am 2f32c04d: am d77d8906: am 6020d698: Merge "select.mk: Tune ccache options" 
* commit 'b2b42bcd546ec6a36bb464cf53ef35e8d084bb52':
  select.mk: Tune ccache options
 2012-08-16 15:33:13 -07:00
Jean-Baptiste Queru
2f32c04d8c am d77d8906: am 6020d698: Merge "select.mk: Tune ccache options" 
* commit 'd77d8906b8fc4a6e2ecaf9bc5f5b84ddec6dbe7e':
  select.mk: Tune ccache options
 2012-08-16 15:28:47 -07:00
Jean-Baptiste Queru
d77d8906b8 am 6020d698: Merge "select.mk: Tune ccache options" 
* commit '6020d698f51132cab374e6c96f7da4902f3aa84f':
  select.mk: Tune ccache options
 2012-08-16 15:27:54 -07:00
Jean-Baptiste Queru
6020d698f5 Merge "select.mk: Tune ccache options" 2012-08-16 14:55:26 -07:00
Andrew Boie
1f93043c86 select.mk: Tune ccache options 
With these adjustments, cached object files can now be shared across
multiple Android trees on a single workstation:

* Compiler binary modification time no longer causes cache misses,
  as a hash of the compiler binary is taken rather than looking
  at the mtime and size
* Header file modification time no longer causes cache misses,
  the headers are now always hashed
* Macros such as __DATE__ and __TIME__ no longer cause cache misses
* All paths in preprocessed source (due to use of -g) are now relative

These options require ccache 3.1 or later to be used; ccache 2.4 will
ignore these.

Change-Id: I7839637e9dacf7240bd9b7bfaa6406b1db423560
Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
 2012-08-16 11:11:29 -07:00
Ying Wang
bc415dd5eb Support to build emmap_mata.zip in unbundled builds. 
Bug: 6987838
Change-Id: Id6c81b08c4859442b7d52054ed5f278575719d1a
 2012-08-16 10:10:11 -07:00
Elliott Hughes
1ae7078d66 am b0a6849a: am a8352cac: am 0fc8d635: am f2a618e1: Merge "The zoneinfo stuff is no longer legacy." 
* commit 'b0a6849a26fd623adc677b8fe13773b6c45151e3':
  The zoneinfo stuff is no longer legacy.
 2012-08-15 20:06:18 -07:00
Elliott Hughes
a8352cac8d am 0fc8d635: am f2a618e1: Merge "The zoneinfo stuff is no longer legacy." 
* commit '0fc8d635a7f3712cc24f7a29d97755bc15972a0a':
  The zoneinfo stuff is no longer legacy.
 2012-08-15 20:03:54 -07:00
Elliott Hughes
0fc8d635a7 am f2a618e1: Merge "The zoneinfo stuff is no longer legacy." 
* commit 'f2a618e1df126c6c48622cce948825e923b52dcb':
  The zoneinfo stuff is no longer legacy.
 2012-08-15 20:02:49 -07:00
Elliott Hughes
f2a618e1df Merge "The zoneinfo stuff is no longer legacy." 2012-08-15 19:43:41 -07:00
Elliott Hughes
e1654eaccb The zoneinfo stuff is no longer legacy. 
Change-Id: I7f76dfc15c0b2febbcdb13f12ff9390dca124585
 2012-08-15 18:34:49 -07:00
Ying Wang
4ec08ee20b Merge "Support to build emmap_mata.zip in unbundled builds." 2012-08-15 15:55:19 -07:00
Ying Wang
e1402c5740 Merge "Add LOCAL_CONLYFLAGS." 2012-08-15 14:17:03 -07:00
Keun young Park
e50b0035d6 am 7b559162: am a8811fda: fix MIPS build 
* commit '7b559162a2d29a89545561295430dd5f70cc1661':
  fix MIPS build
 2012-08-15 14:05:50 -07:00
Keun young Park
a8811fda4f fix MIPS build 
- crtxx.o built under TARGET_OUT_INTERMEDIATE_LIBRARIES,
  not under TARGET_OUT_STATIC_LIBRARIES

Change-Id: Ife05206bd66f691853100bbf17e08a13c287d073
 2012-08-15 13:42:37 -07:00
Ying Wang
da19eafc42 Support to build emmap_mata.zip in unbundled builds. 
Bug: 6987838
Change-Id: Id6c81b08c4859442b7d52054ed5f278575719d1a
 2012-08-15 12:22:44 -07:00
Ying Wang
7429e21c2e Add LOCAL_CONLYFLAGS. 
To pass compiler flags
LOCAL_CFLAGS: to both C and C++ files;
LOCAL_CONLYFLAGS: to only C files but not C++ files;
LOCAL_CPPFLAGS: to only C++ file.
LOCAL_CPPFLAGS and LOCAL_CONLYFLAGS can override flags in LOCAL_CFLAGS.

Bug: 6967573
Change-Id: I88d9de0980e451b94bc7ae8c741ea2030eada3e1
 2012-08-15 11:02:28 -07:00
Iliyan Malchev
745b93a04f am 526097e4: am 0016a9ba: Merge "build: register BOARD_HAVE_BLUETOOTH_QCOM" into jb-mr1-dev 
* commit '526097e48c433c1488871d36bd7024e7b124f4a3':
  build: register BOARD_HAVE_BLUETOOTH_QCOM
 2012-08-15 09:21:45 -07:00
Iliyan Malchev
0016a9ba8d Merge "build: register BOARD_HAVE_BLUETOOTH_QCOM" into jb-mr1-dev 2012-08-15 09:18:12 -07:00
Iliyan Malchev
0854694c51 build: register BOARD_HAVE_BLUETOOTH_QCOM 
Change-Id: I594abd6d3b152a4e5bc48b6ac447e155c85b2fe0
Signed-off-by: Iliyan Malchev <malchev@google.com>
 2012-08-15 08:12:06 -07:00
Ying Wang
27d51bf6d3 Force out LOCAL_NDK_VERSION. 
Change-Id: I0a9f1a630ef2019bed38d420525eac9510b09798
 2012-08-14 13:06:22 -07:00
Jean-Baptiste Queru
4ed71fc43a am d68ef45f: am 1196c824: am 7159a992: am 4eddad55: Merge "Set the AOSP master to be API level 16" 
* commit 'd68ef45f49fab6fd4600f40e119976f22a0ca86b':
  Set the AOSP master to be API level 16
 2012-08-14 11:58:38 -07:00
Ying Wang
54fdb473b6 Retire LOCAL_NDK_VERSION. 
We are now unifying the NDK versions of unbundled native code to always
use the latest NDK.
We don't need the variable LOCAL_NDK_VERSION now.
To build native code with NDK, you need set just LOCAL_SDK_VERSION.

Bug: 6932421
Change-Id: I86f05a264249cda6bae97b4b1616f03700cd9dfa
 2012-08-14 11:58:13 -07:00
Ying Wang
d4f0ffcb6b Merge "Adopt the new prebuilts/ndk/<number> paths." into jb-mr1-dev 2012-08-14 11:57:01 -07:00
Ying Wang
7f8d0ba6bd Adopt the new prebuilts/ndk/<number> paths. 
Bug: 6932421
Change-Id: Iba7200aacef2201001f92c6ffa020881f0b528ea
 2012-08-14 11:55:46 -07:00
Jean-Baptiste Queru
1196c82491 am 7159a992: am 4eddad55: Merge "Set the AOSP master to be API level 16" 
* commit '7159a992ddcda51c91843a29cd1aa30815bc8370':
  Set the AOSP master to be API level 16
 2012-08-14 11:55:19 -07:00
Jean-Baptiste Queru
7159a992dd am 4eddad55: Merge "Set the AOSP master to be API level 16" 
* commit '4eddad550ee81edba01734bf378612ed18841751':
  Set the AOSP master to be API level 16
 2012-08-14 11:53:40 -07:00
Ying Wang
fe1bfe7dc9 Force out LOCAL_NDK_VERSION. 
Change-Id: I0a9f1a630ef2019bed38d420525eac9510b09798
 2012-08-14 11:08:03 -07:00
Ying Wang
848020f22a Retire LOCAL_NDK_VERSION. 
We are now unifying the NDK versions of unbundled native code to always
use the latest NDK.
We don't need the variable LOCAL_NDK_VERSION now.
To build native code with NDK, you need set just LOCAL_SDK_VERSION.

Bug: 6932421
Change-Id: I86f05a264249cda6bae97b4b1616f03700cd9dfa
 2012-08-14 10:16:02 -07:00
Jean-Baptiste Queru
e46e8603b2 Set the AOSP master to be API level 16 
Change-Id: I3ba4317aa1081ae5f60ac8504cfff8f4abee5e66
 2012-08-14 09:07:33 -07:00
Ying Wang
4000ff5611 am d88c10d7: am f59a64b7: am d3d0beca: am 392bdc1f: Merge "Move the selinux modules to core PRODUCT_PACKAGES" 
* commit 'd88c10d7691f2717a2c1fd0801c9a7798fbe0334':
  Move the selinux modules to core PRODUCT_PACKAGES
 2012-08-13 16:30:15 -07:00
Ying Wang
f59a64b7cb am d3d0beca: am 392bdc1f: Merge "Move the selinux modules to core PRODUCT_PACKAGES" 
* commit 'd3d0becac9a13836b7c20acba3b21b0625d92324':
  Move the selinux modules to core PRODUCT_PACKAGES
 2012-08-13 16:26:06 -07:00
Ying Wang
d3d0becac9 am 392bdc1f: Merge "Move the selinux modules to core PRODUCT_PACKAGES" 
* commit '392bdc1f08eb03ad04eba24a76cc0aea7e1b46d6':
  Move the selinux modules to core PRODUCT_PACKAGES
 2012-08-13 16:24:11 -07:00
Ying Wang
3f2ec394b2 am 721cd087: am 4150db69: am d7547163: am 679b7498: Merge "Add mac_permissions.xml dependency." 
* commit '721cd087bd7f02802a0545f8826f5835cc3dea26':
  Add mac_permissions.xml dependency.
 2012-08-13 16:08:27 -07:00
Ying Wang
4150db6905 am d7547163: am 679b7498: Merge "Add mac_permissions.xml dependency." 
* commit 'd7547163d5b0bf9e2cde626c0b7c6a58d48eb89e':
  Add mac_permissions.xml dependency.
 2012-08-13 16:03:29 -07:00
Ying Wang
82ccebaa59 Move the selinux modules to core PRODUCT_PACKAGES 
The module names are phony targets and we should avoid having file targets
depend on phony targets.
Instead the build system makes sure to use the file dependency with
PRODUCT_PACKAGES.

Change-Id: I8dc59d8f9ed92c146b8827d71278e27214e60f3a
 2012-08-13 15:40:43 -07:00
Ying Wang
d7547163d5 am 679b7498: Merge "Add mac_permissions.xml dependency." 
* commit '679b7498af86ee084791e86d06eaad87fe2f27f0':
  Add mac_permissions.xml dependency.
 2012-08-13 15:17:45 -07:00
Ying Wang
679b7498af Merge "Add mac_permissions.xml dependency." 2012-08-13 14:52:24 -07:00
Ying Wang
939c427de2 Merge "Automatically add Java resources carried by static Java libraries." 2012-08-13 08:46:03 -07:00
Elliott Hughes
81a2f33a87 am d99a3665: am 880d3f39: resolved conflicts for merge of 0ac38a4e to jb-mr1-dev 
* commit 'd99a36651079b47ff159ef917cc513fdb5364bef':
  Remove TARGET_linux-sh.mk.
 2012-08-11 15:18:07 -07:00
Ying Wang
239d0495de Merge "Don't pass LOCAL_CFLAGS when compiling assembly code." 2012-08-11 13:18:21 -07:00
Ying Wang
178e7fc515 Merge "Adopt the new prebuilts/ndk/<number> paths." 2012-08-11 13:16:33 -07:00
Elliott Hughes
880d3f39f7 resolved conflicts for merge of 0ac38a4e to jb-mr1-dev 
Change-Id: I0978f511f807797f89be4002bca654492231761c
 2012-08-11 12:00:51 -07:00
Elliott Hughes
0ac38a4e5e am 20e713d1: Merge "Remove TARGET_linux-sh.mk." 
* commit '20e713d151dde66058453ec822b6bca8793008a4':
  Remove TARGET_linux-sh.mk.
 2012-08-11 11:51:39 -07:00
Guang Zhu
b864620faf am e4662db1: am 62f03479: Merge "Use new flag for emma instrumented build and limit to apps only" into jb-mr1-dev 
* commit 'e4662db1601c189e920637a5d9efbb175edefb74':
  Use new flag for emma instrumented build and limit to apps only
 2012-08-10 18:48:47 -07:00
Guang Zhu
62f034792d Merge "Use new flag for emma instrumented build and limit to apps only" into jb-mr1-dev 2012-08-10 18:44:43 -07:00
Ying Wang
65d785274e Don't pass LOCAL_CFLAGS when compiling assembly code. 
Bug: 6967574
Change-Id: Id428884dde3026c32fa6abcabbc88d188b7e9a38
 2012-08-10 18:10:15 -07:00
Elliott Hughes
5f6c7fd884 Remove TARGET_linux-sh.mk. 
SH support is long gone from bionic and dalvik.

Change-Id: I613df5f0062d743686847610737af9a321eec1da
 2012-08-10 15:36:51 -07:00
Nick Kralevich
ec249e8c54 am 1b3914f5: am 62481e30: Merge "arm: add --warn-shared-textrel" into jb-mr1-dev 
* commit '1b3914f595a6c961d597d7dc66fb95f8f2afef24':
  arm: add --warn-shared-textrel
 2012-08-10 14:15:24 -07:00
Nick Kralevich
62481e30f3 Merge "arm: add --warn-shared-textrel" into jb-mr1-dev 2012-08-10 14:11:14 -07:00
Nick Kralevich
b238210c01 arm: add --warn-shared-textrel 
Emit a warning when the static linker detects a shared library
has text relocations. Text relocations make it harder to
share pages across processes, and make it harder to use
certain memory protection features in, for example, SELinux.

This warning will turn into an error in a future change
(via --fatal-warnings)

References: http://www.akkadia.org/drepper/textrelocs.html

Change-Id: I3bc818e3ecdb8a4338668a9e816b6dc1081b7557
 2012-08-10 13:05:53 -07:00
Jean-Baptiste Queru
51005fd1af am 224f28a8: am 049d97d7: am 2387857d: am 968f20a4: Merge "MIPS support to *.mk files and envsetup.sh" 
* commit '224f28a845a107d46500c7977cb0e2abeff1ebba':
  MIPS support to *.mk files and envsetup.sh
 2012-08-10 12:48:48 -07:00
Jean-Baptiste Queru
4ef3508ea4 am 8e175c8a: am c244634e: am 64b8c6e9: am 6e6d92c4: Merge "Support for MIPS Build targets." 
* commit '8e175c8a99c3a85c8cc726d619a784fc3c539a41':
  Support for MIPS Build targets.
 2012-08-10 12:48:47 -07:00
Jean-Baptiste Queru
049d97d778 am 2387857d: am 968f20a4: Merge "MIPS support to *.mk files and envsetup.sh" 
* commit '2387857dad06b3437ffcf0c14e2bc9f5956a5888':
  MIPS support to *.mk files and envsetup.sh
 2012-08-10 12:43:59 -07:00
Jean-Baptiste Queru
c244634e8f am 64b8c6e9: am 6e6d92c4: Merge "Support for MIPS Build targets." 
* commit '64b8c6e936ae713a61c53a85a0badbd7d480e414':
  Support for MIPS Build targets.
 2012-08-10 12:43:58 -07:00
Ying Wang
f0dd8584fd Adopt the new prebuilts/ndk/<number> paths. 
Bug: 6932421
Change-Id: Iba7200aacef2201001f92c6ffa020881f0b528ea
 2012-08-10 10:57:37 -07:00
Jean-Baptiste Queru
2387857dad am 968f20a4: Merge "MIPS support to *.mk files and envsetup.sh" 
* commit '968f20a4c2ffca9a0cf8870bd96c77e65ca61243':
  MIPS support to *.mk files and envsetup.sh
 2012-08-10 09:23:42 -07:00
Jean-Baptiste Queru
64b8c6e936 am 6e6d92c4: Merge "Support for MIPS Build targets." 
* commit '6e6d92c47acbb976ce47ae4d90406fa56ea68a3a':
  Support for MIPS Build targets.
 2012-08-10 09:23:39 -07:00
Raghu Gandham
8da4310646 MIPS support to *.mk files and envsetup.sh 
Change-Id: Iba4d046e3202524b29cfe32980927f8cc0aa8496
Signed-off-by: Chris Dearman <chris@mips.com>
Signed-off-by: Raghu Gandham <raghu@mips.com>
 2012-08-10 09:15:38 -07:00
Jean-Baptiste Queru
6e6d92c47a Merge "Support for MIPS Build targets." 2012-08-10 08:39:34 -07:00
Ying Wang
8548062922 Automatically add Java resources carried by static Java libraries. 
Bug: 6892294
Change-Id: I3ff71ee3d7b9ccdfde6a5284cc350864fbffa71f
 2012-08-09 15:24:27 -07:00
Doug Zongker
45ec95e266 am c8d8a1e6: am 72f0b676: tidy up building of recovery ramdisk image 
* commit 'c8d8a1e62b81f8832c1566f3f12f842abb2bfe03':
  tidy up building of recovery ramdisk image
 2012-08-09 12:45:13 -07:00
Doug Zongker
72f0b67673 tidy up building of recovery ramdisk image 
Copy init.recovery.*.rc files (if any) from the main system ramdisk,
and hide all the commands.

Change-Id: I4d4fcf25b66ddea70e43282d466983e9643c9bea
 2012-08-09 08:56:01 -07:00
Colin Cross
9ab236b60c am 7aeaaa04: am e98b836f: Merge "recovery: don\'t delete hardware specific init*.rc files" into jb-mr1-dev 
* commit '7aeaaa04a079401e1c76b2d68c6a5308ddb3c0aa':
  recovery: don't delete hardware specific init*.rc files
 2012-08-08 17:56:40 -07:00
Colin Cross
e98b836f26 Merge "recovery: don't delete hardware specific init*.rc files" into jb-mr1-dev 2012-08-08 17:53:38 -07:00
Guang Zhu
79f68bc925 Use new flag for emma instrumented build and limit to apps only 
Based on existing setup, when EMMA_INSTRUMENT is used on a full
build, all Java modules will be processed with emma instrument
unless otherwise marked in their own Makefiles.

For the purpose of collecting code coverage, emma-instrument
all Java modules aren't that useful, instead, instrumenting all
the app packages is more useful. This change adds a new flag
EMMA_FULL_APP_INSTRUMENT, which can be used with a full build
to instrument all app packages.

Change-Id: Ie143fed49c23402b21f6cccac2ef25741726be45
 2012-08-08 16:46:53 -07:00
Ying Wang
58a3051c84 am e1770f5f: am 9c649a75: Don\'t install overridden packages in pdk fusion files. 
* commit 'e1770f5fc85eccc7124cd2effb634baa308851eb':
  Don't install overridden packages in pdk fusion files.
 2012-08-08 15:42:06 -07:00
Ying Wang
9c649a7542 Don't install overridden packages in pdk fusion files. 
Bug: 6942063
Change-Id: I14fc25b22b13bceeea8fa48491465233b19ab106
 2012-08-08 15:36:43 -07:00
Jean-Baptiste Queru
00ef82edff am f5bbfe82: am b0cc9aae: am 35b24a82: am 8776f34a: Merge "x86: cleanups for toolchain" 
* commit 'f5bbfe825afdbcb6e88df19ef6535b23ea5589e7':
  x86: cleanups for toolchain
 2012-08-08 15:11:25 -07:00
Jean-Baptiste Queru
b38193e0ff am 61c4a50e: am 1870b7f4: am a4814370: am 4733cfd2: Merge "definitions.mk: Don\'t use GCC \'@\' parameter" 
* commit '61c4a50edb2b75a05a9804421a3138fb9c822598':
  definitions.mk: Don't use GCC '@' parameter
 2012-08-08 15:11:07 -07:00
Jean-Baptiste Queru
b0cc9aae50 am 35b24a82: am 8776f34a: Merge "x86: cleanups for toolchain" 
* commit '35b24a8234baa93d23a9ea029b8e8e675b134f7d':
  x86: cleanups for toolchain
 2012-08-08 14:06:28 -07:00
Jean-Baptiste Queru
35b24a8234 am 8776f34a: Merge "x86: cleanups for toolchain" 
* commit '8776f34aaad8394caf58b864a41765b7ced52a65':
  x86: cleanups for toolchain
 2012-08-08 14:04:17 -07:00
Jean-Baptiste Queru
8776f34aaa Merge "x86: cleanups for toolchain" 2012-08-08 13:40:19 -07:00
Jean-Baptiste Queru
1870b7f4f2 am a4814370: am 4733cfd2: Merge "definitions.mk: Don\'t use GCC \'@\' parameter" 
* commit 'a4814370724634c0ee0bf35bc68f382f0df93668':
  definitions.mk: Don't use GCC '@' parameter
 2012-08-08 13:26:40 -07:00
Jean-Baptiste Queru
a481437072 am 4733cfd2: Merge "definitions.mk: Don\'t use GCC \'@\' parameter" 
* commit '4733cfd2de0bed2dfdf4c32517b0c59762c85b2e':
  definitions.mk: Don't use GCC '@' parameter
 2012-08-08 13:24:44 -07:00
Jean-Baptiste Queru
4733cfd2de Merge "definitions.mk: Don't use GCC '@' parameter" 2012-08-08 13:18:56 -07:00
Jean-Baptiste Queru
a46664be59 am 98092627: am 7de61d14: am 04363aa5: am af541a64: Merge "core/Makefile: also look for device/*/build/tasks" 
* commit '98092627cd9731ea09cbf225880e5c48dc6f564e':
  core/Makefile: also look for device/*/build/tasks
 2012-08-08 13:11:21 -07:00
Jean-Baptiste Queru
7de61d1471 am 04363aa5: am af541a64: Merge "core/Makefile: also look for device/*/build/tasks" 
* commit '04363aa5bd7ae0f2b5a8d09c25a83371933d0d12':
  core/Makefile: also look for device/*/build/tasks
 2012-08-08 13:07:59 -07:00
Jean-Baptiste Queru
04363aa5bd am af541a64: Merge "core/Makefile: also look for device/*/build/tasks" 
* commit 'af541a64abd16f6a33146a833dce71e739b722c8':
  core/Makefile: also look for device/*/build/tasks
 2012-08-08 13:06:25 -07:00
Colin Cross
629c87b832 recovery: don't delete hardware specific init*.rc files 
init used to automatically execute hardware specific init.rc files from
init.<hardware>.rc.  If the hardware specific init.rc file was installed
in recovery.img, various unwanted services would try to start, so init*.rc
was deleted when creating the recovery root directory.

init was recently modified to explicitly import init.${ro.hardware}.rc
from the default init.rc, rather than always trying to load it.  Since
recovery replaces the default init.rc with a custom one, it will never
try to load hardware specific init files.

In addition, there are cases where we need to start hardware specific
services, for example watchdogd, so we need
init.recovery.${ro.hardware}.rc to be installed.

Modify the build rule to delete the default init.rc from the recovery
root directory so it can be replaced with the custom recovery init.rc,
but leave all the hardware specific init files in place.

Bug: 6953625
Change-Id: I5d9555e3d54d2f1d9f49fb981bd412c53741337e
 2012-08-08 13:04:58 -07:00
Jean-Baptiste Queru
af541a64ab Merge "core/Makefile: also look for device/*/build/tasks" 2012-08-08 12:58:56 -07:00
Elliott Hughes
b27a5d92de Remove libastl and libastl_host from the grandfathered list. 
astl is dead.

Change-Id: I123d1de9da23576c76772a6c9b73046aa0d189ef
 2012-08-08 11:00:39 -07:00
Elliott Hughes
6d722494cb Remove the obsolete bin2asm tool. 
We haven't used this to assemble the ICU data into a .o file since
like Eclair.

Change-Id: I34d903aa1be31244c63f7d60afa90df9a3e6c21e
 2012-08-08 09:44:05 -07:00
Ying Wang
488e249e9e am 5da8a5ff: am 7f9db64d: Merge "Add libstagefright and libstagefright_chromium_http to core.mk." into jb-mr1-dev 
* commit '5da8a5ffa2c06ba0cf598bcc13feda950990f6e5':
  Add libstagefright and  libstagefright_chromium_http to core.mk.
 2012-08-03 17:50:53 -07:00
Ying Wang
7f9db64d0e Merge "Add libstagefright and libstagefright_chromium_http to core.mk." into jb-mr1-dev 2012-08-03 17:46:49 -07:00
Ying Wang
c10da6c540 Add libstagefright and libstagefright_chromium_http to core.mk. 
Bug: 6933259
Change-Id: Ibe83a95bed7679d6260ef7500c459dcd7ae71812
 2012-08-03 17:44:06 -07:00
Shih-wei Liao
a56e96edfb am c91bb757: am c814bcef: Fix build: After merging in Clang, -Wno-psabi is no longer supported. 
* commit 'c91bb757eee86f20e2c8e0ae89d1995e647be1b8':
  Fix build: After merging in Clang, -Wno-psabi is no longer supported.
 2012-08-03 05:38:14 -07:00
Shih-wei Liao
c814bcefd7 Fix build: After merging in Clang, -Wno-psabi is no longer supported. 
-Wno-unused-but-set-variable is not supported either.

Change-Id: Ic416048a0b078efa50515539f6cac9db472ad086
 2012-08-03 05:17:23 -07:00
Doug Zongker
9492697a23 am 42caec28: am 1e845d33: Merge "add extra args to mkbootimg" into jb-mr1-dev 
* commit '42caec28ab1393853c342a989ec844846235013f':
  add extra args to mkbootimg
 2012-08-02 15:17:15 -07:00
Keun young Park
b4eb3d8005 am 0eeeab73: am 15b2b0f7: Merge "keep PLATFORM_ZIP specified explicitly" into jb-mr1-dev 
* commit '0eeeab736e3047cec89d69d2e3f034bef83bbc60':
  keep PLATFORM_ZIP specified explicitly
 2012-08-02 15:09:30 -07:00
Doug Zongker
1e845d33af Merge "add extra args to mkbootimg" into jb-mr1-dev 2012-08-02 15:06:10 -07:00
Doug Zongker
d513160b76 add extra args to mkbootimg 
Arrange to take $(BOARD_MKBOOTIMG_ARGS) and pass it to all invocations
of mkbootimg from within make, and to store it in the target_files so
it can be used by future invocations of img_from_target_files and
ota_from_target_files.

Bug: 6918260
Change-Id: I7130ac52e96bd51d4d8b80ca036635e1626f01f1
 2012-08-02 15:03:41 -07:00
Keun young Park
4da8e127c7 keep PLATFORM_ZIP specified explicitly 
- the old behaviour was to override with default one, which makes
  trying different sets of platform.zip difficult if default one exists

Change-Id: I4c8ac2e44d9e7b48f77d628cce3edb20fbdf27e4
 2012-08-02 12:51:59 -07:00
Keun young Park
c37df0af05 am 110f0f69: am fad81e89: Merge "add symbol files to PDK release for debugging" into jb-mr1-dev 
* commit '110f0f69e99f9ef9fde26073b41da9ec01f4120f':
  add symbol files to PDK release for debugging
 2012-08-01 14:52:54 -07:00
Keun young Park
722266918f add symbol files to PDK release for debugging 
- app_process is not in PDK, and this makes native debugging difficult
  So provide symbol file instead of source

Bug: 6774048

Change-Id: I1a3a86cf64d8f1d22cdb3a22714f508de963099b
 2012-08-01 12:49:01 -07:00
Raghu Gandham
06afc1c5ab Support for MIPS Build targets. 
Change-Id: I14c27305298ce36d5c100abf25489275c2269c5f
Signed-off-by: Chris Dearman <chris@mips.com>
Signed-off-by: Raghu Gandham <raghu@mips.com>
 2012-08-01 11:18:25 -07:00
Ying Wang
5fe385add4 Merge "Allow Java resource in apk." 2012-07-31 14:16:06 -07:00
Ying Wang
721449ea04 Allow Java resource in apk. 
Bug: 6892294
Change-Id: I093bddf7326d600689ff2ec3318741a5270751cc
 2012-07-31 09:40:00 -07:00
Dianne Hackborn
75f4c72320 This branch is now JB MR1 development. 
Change-Id: Id0463a82826c0fe4c518559fe40e4d6e088aaad9
 2012-07-30 18:32:04 -07:00
Jean-Baptiste Queru
228e8cf660 Add new vendors 
Change-Id: Id0d3599257ae39077063bb5903c912526e02cb0e
 2012-07-27 23:19:51 -07:00
Jean-Baptiste Queru
ab81700ce9 am 47e63bb4: Merge "Fix build." 
* commit '47e63bb4e471a2b6ed0a3c20f386668809452840':
  Fix build.
 2012-07-27 10:14:48 -07:00
Ying Wang
7023f6179d Fix build. 
Set BUILD_EMULATOR to true when HOST_OS is linux.
Disable the emulator package target if BUILD_EMULATOR is not true.

Change-Id: I8987c0a091622baa0e861b451e635c4ddb148b29
 2012-07-27 09:57:36 -07:00
Ying Wang
7d8c535c1f Fix build. 
Set BUILD_EMULATOR to true when HOST_OS is linux.
Disable the emulator package target if BUILD_EMULATOR is not true.

Change-Id: I8987c0a091622baa0e861b451e635c4ddb148b29
 2012-07-26 15:12:21 -07:00
Andrew Boie
85f3b21971 definitions.mk: Don't use GCC '@' parameter 
This parameter (which causes GCC to pull additional command line
parameters out of a file) is incompatible with ccache.

- With ccache 2.x, ccache will ignore this parameters, and potentially
compute invalid command line hashes since it is not reading the
parameter file

- With ccache 3.x, ccache will refuse to cache the files and error
with 'Unsupported compiler option'.

We still use the parameter file, but Make expands it instead.

Change-Id: I070c3877cbe2d058e1cf4754bac535e7f3498861
Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
 2012-07-26 10:21:04 -07:00
Ed Heyl
f8a3059892 resolved conflict in mergre to goog/master 
Change-Id: I6ee3a8802595786a91a1bd77188648fda9dc3447
 2012-07-26 07:45:43 -07:00
Nick Kralevich
4c9c895ab8 am 07a06f6e: am f0daadf6: am 297d6c02: Merge "Add property_contexts to SELINUX_DEPENDS." 
* commit '07a06f6e4487f2ad7d667d134fe19a089bee8412':
  Add property_contexts to SELINUX_DEPENDS.
 2012-07-25 23:00:29 -07:00
Joe Onorato
2dd9902cf9 am 4ae631f4: am c11b5efa: Merge "Should have been included in 74e883d1415f68dc52a7e679cd1ea1f486b8d8bb" 
* commit '4ae631f4560d383c28767641bb7e9e47ab175c7f':
  Should have been included in 74e883d141
 2012-07-25 22:24:02 -07:00
Joe Onorato
42f0127a06 am e3adc7fd: am c22da7d7: Merge "Don\'t try to build the emulator on Mac OS if the right tools aren\'t installed." 
* commit 'e3adc7fdcc04b7382d6818c5157c0a06eaf8c48f':
  Don't try to build the emulator on Mac OS if the right tools aren't installed.
 2012-07-25 22:24:00 -07:00
Joe Onorato
4ae631f456 am c11b5efa: Merge "Should have been included in 74e883d1415f68dc52a7e679cd1ea1f486b8d8bb" 
* commit 'c11b5efa3a20e2364dfffbfa205306b9bd2e538a':
  Should have been included in 74e883d141
 2012-07-25 22:22:15 -07:00
Joe Onorato
e3adc7fdcc am c22da7d7: Merge "Don\'t try to build the emulator on Mac OS if the right tools aren\'t installed." 
* commit 'c22da7d7e2de0b4cbeefb533990d81581d19432a':
  Don't try to build the emulator on Mac OS if the right tools aren't installed.
 2012-07-25 22:22:14 -07:00
Joe Onorato
e35a445f2f Should have been included in 74e883d141 
Change-Id: Ia0d06a89d0efd36c877e51b0adb45ae7bb3e5480
 2012-07-25 17:55:03 -07:00
Andrew Hsieh
4b0c5ee8e0 am c759e468: am b7391efb: Merge "Add -fuse-ld=bfd to x86 target" 
* commit 'c759e468995417a0c8c0ca7ca38e4c937a176ab8':
  Add -fuse-ld=bfd to x86 target
 2012-07-25 15:06:00 -07:00
Nick Kralevich
07a06f6e44 am f0daadf6: am 297d6c02: Merge "Add property_contexts to SELINUX_DEPENDS." 
* commit 'f0daadf6988c823355e9b59996e3dc798b7b7619':
  Add property_contexts to SELINUX_DEPENDS.
 2012-07-25 15:05:58 -07:00
Joe Onorato
74e883d141 Don't try to build the emulator on Mac OS if the right tools aren't installed. 
Change-Id: I3cd2f82f9ee64174bddbb12a18ca8fcf23bdcebd
 2012-07-25 15:01:22 -07:00
Andrew Hsieh
c759e46899 am b7391efb: Merge "Add -fuse-ld=bfd to x86 target" 
* commit 'b7391efbf03d47876fd0747a5cf2199f6b4a503a':
  Add -fuse-ld=bfd to x86 target
 2012-07-25 14:25:30 -07:00
Nick Kralevich
f0daadf698 am 297d6c02: Merge "Add property_contexts to SELINUX_DEPENDS." 
* commit '297d6c02bc1e1c63404d8d81df28f3f13046fe85':
  Add property_contexts to SELINUX_DEPENDS.
 2012-07-25 14:25:28 -07:00
Andrew Hsieh
f116e9bc84 Add -fuse-ld=bfd to x86 target 
Add -fuse-ld=bfd because ld.gold doesn't support "--copy-dt-needed-entries".

Change-Id: I4e78967a076b3d093dd55366f7a54f0c9f9a45d1
 2012-07-25 11:06:28 -07:00
Andrew Hsieh
bae121afcd Add -fuse-ld=bfd to x86 target 
Add -fuse-ld=bfd because ld.gold doesn't support "--copy-dt-needed-entries".

Change-Id: Ie6fa0a2ddfc57b650552c8cf0891f738a5be0dda
 2012-07-25 11:02:52 -07:00
Ying Wang
9f42af5bbc resolved conflicts for merge of a8df6091 to master 
Change-Id: I2d088c09738b34f72c2efa030304fca28ad0e791
 2012-07-23 19:49:48 -07:00
Ying Wang
a8df6091fe am 28437aac: Add LOCAL_SOURCE_FILES_ALL_GENERATED support 
* commit '28437aac999eb04d1698d9a6de87a25b5b772da6':
  Add LOCAL_SOURCE_FILES_ALL_GENERATED support
 2012-07-23 10:32:54 -07:00
rpcraig
20b1d09593 Add mac_permissions.xml dependency. 
Include the MMAC install perms policy configuration
file to the list of SELINUX dependencies.
This changes depends on the project:

git.selinuxproject.org/~seandroid/selinux/mac-policy

Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>

Change-Id: Ief91d6a717741c91c5ba8745452bb247dc8048ec
 2012-07-20 16:51:18 -04:00
Ying Wang
28437aac99 Add LOCAL_SOURCE_FILES_ALL_GENERATED support 
Set "LOCAL_SOURCE_FILES_ALL_GENERATED := true" if you want to build a
Java library from only generated source files, without any static
source files. Previously this is not allowed.
This is needed by building api stub libraries, which have only source
files of generated stub files.

Bug: 6814443
Change-Id: Idb2ae9c71a473b796154a03ef07a3403461c4f3c
 2012-07-19 14:38:43 -07:00
Colin Cross
6fe6c3c22e pdk: add telephony-common and mms-common 
Factory test apps may need to compile against telephony-common and
mms-common, include the jars in the pdk platform.zip.

Change-Id: Ic3533ec42115150b94298f15acd877ef61c6660c
 2012-07-18 16:06:19 -07:00
Nick Kralevich
297d6c02bc Merge "Add property_contexts to SELINUX_DEPENDS." 2012-07-18 13:55:10 -07:00
Bruce Beare
42ced6d5e2 x86: cleanups for toolchain 
The 4.4.3 TC was still being specified in one spot.
Also, no need to cross-set x86/ARM variables when buliding
for ARM/x86.

Change-Id: Icbb0f772a983a24dc10ccab0800d4b7bbd60a099
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
 2012-07-17 21:40:12 -07:00
Wink Saville
c4e790dc64 Create telephony-common and mms-common - DO NOT MERGE 
These have been created to reduce the size and complexity
of frameworks/base.

mms-common was created by moving all of
  frameworks/base/core/java/com/google/android/mms
to:
  frameworks/opt/mms

telephony-common was created by moving some of
  frameworks/base/telephony
to:
  frameworks/opt/telephony

Change-Id: I5613c1447dbe655c55f9ba499e453bb59a06c4c0
 2012-07-17 12:22:58 -07:00
Andrew Boie
f34a9bac0e core/Makefile: also look for device/*/build/tasks 
This eases cross-repo dependencies between device/ and
vendor/.

Change-Id: I72e283d22f16e50555ec7ba7bcf9c61ea07f083c
Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
 2012-07-17 10:22:30 -07:00
Justin Ho
2f16ba5997 Android 4.1.2 version bump 
Change-Id: Ie135022b4ddcac457071aec7b217d41ebdcde188
 2012-07-12 16:21:00 -07:00
Wink Saville
a44a92914b Merge commit 'c16c9454' into mit 
* commit 'c16c9454':
  Create telephony-common and mms-common
 2012-07-11 18:08:21 -07:00
Wink Saville
c16c945497 Create telephony-common and mms-common 
These have been created to reduce the size and complexity
of frameworks/base.

mms-common was created by moving all of
  frameworks/base/core/java/com/google/android/mms
to:
  frameworks/opt/mms

telephony-common was created by moving some of
  frameworks/base/telephony
to:
  frameworks/opt/telephony

Change-Id: I5613c1447dbe655c55f9ba499e453bb59a06c4c0
 2012-07-06 18:06:36 -07:00
rpcraig
9e43f34840 Add property_contexts to SELINUX_DEPENDS. 
This ensures there is a dependency between the root image
and changes to property_contexts file.
Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>

Change-Id: I9bd2c3fc44015d6013e6a1f200f8abded271654f
 2012-07-05 10:50:27 -04:00
Ed Heyl
952f55e7ae 4.1.1 
Change-Id: Ide0b70ce6322dad26461a9fb87e1b629aaedf1e5
 2012-07-03 13:54:49 -07:00
Ying Wang
594165c17b am 9ffe27e0: am 9e38d6bf: Merge "This property is set when HAVE_SELINUX:=true during build." 
* commit '9ffe27e013c84e036d5e38b02edf3ca12f7405a8':
  This property is set when HAVE_SELINUX:=true during build.
 2012-07-03 12:20:50 -07:00
Ying Wang
9ffe27e013 am 9e38d6bf: Merge "This property is set when HAVE_SELINUX:=true during build." 
* commit '9e38d6bf1bf78a00d8f4288e6444be358a70a692':
  This property is set when HAVE_SELINUX:=true during build.
 2012-07-03 12:16:03 -07:00
William Roberts
9d8a51f537 This property is set when HAVE_SELINUX:=true during build. 
This will provide a convenient method for determing build
configuration when in the Java layer. For instance, this will
be used in change id I69529fb7a3adfe31eccb16d79740fc4952ff5e68
to determine if the Settings app should display the SE Linux
status.

Change-Id: Idc8dff020aaac41649eac64f5fa8e311dabbc51f
 2012-07-03 11:05:03 -07:00
Ying Wang
dfb5818027 am d512fda4: am e42ed0ba: Merge "Move the llvm-gcc warning from HOST_darwin-x86.mk to main.mk" 
* commit 'd512fda4ae7cc56cc9b83fcb6e7a9e0d0f02c259':
  Move the llvm-gcc warning from HOST_darwin-x86.mk to main.mk
 2012-06-29 20:22:20 -07:00
Ying Wang
d512fda4ae am e42ed0ba: Merge "Move the llvm-gcc warning from HOST_darwin-x86.mk to main.mk" 
* commit 'e42ed0ba1571f20866609710ba7c73fd138c0405':
  Move the llvm-gcc warning from HOST_darwin-x86.mk to main.mk
 2012-06-29 20:19:50 -07:00