Commit Graph

2468 Commits

Author SHA1 Message Date
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
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
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