Commit Graph

3240 Commits

Author SHA1 Message Date
The Android Automerger c618d4f100 Fix klp-dev build file 2013-08-08 07:47:58 -07:00
The Android Automerger 2a516ccce5 "KRS39B" 2013-08-08 07:39:23 -07:00
Mike Lockwood c73018c2e9 Fix typo from previous change to fix the build
Change-Id: I6cf7217eb81abd794339143b7c23456b68808caf
2013-08-06 16:15:48 -07:00
Mike Lockwood 6e5d867e30 Add support for overriding default Java libraries on a per-target basis
Change-Id: I425041554867a7ed7d74e1d603f160b2110bc86b
2013-08-06 15:07:18 -07:00
Ying Wang 2c86e70705 Merge "Don't check build prebuilt modules." 2013-08-02 20:31:53 +00:00
Ying Wang 883071ff1f Don't check build prebuilt modules.
Change-Id: I35bcd97cf41d1f6e0cdc2676a07127bff4f14e6d
2013-08-02 13:30:54 -07:00
Ying Wang ee9e88cf96 am a3827c4b: am 840f9d0a: Merge "Remove BUILD_HOST_JAVA_LIBRARY dependency on aapt"
* commit 'a3827c4b6c1a4c5a1618515ccb8fc6692837ee71':
  Remove BUILD_HOST_JAVA_LIBRARY dependency on aapt
2013-08-02 11:07:44 -07:00
Ying Wang a3827c4b6c am 840f9d0a: Merge "Remove BUILD_HOST_JAVA_LIBRARY dependency on aapt"
* commit '840f9d0a274cffbef790dc20cd4f9eec27c3841b':
  Remove BUILD_HOST_JAVA_LIBRARY dependency on aapt
2013-08-02 11:05:23 -07:00
Brian Carlstrom 5c619fcb5f Remove BUILD_HOST_JAVA_LIBRARY dependency on aapt
Change-Id: I8be48114b43e46255977be1677b0c0bbccdf9163
2013-08-01 23:31:19 -07:00
Ying Wang 3670c8449a Split the product-graph build commands
1) As more product configuration files are added to the source tree, the
command line has become too long.
2) Escape "(" and ")" that may may appear in PRODUCT_MODEL.

Change-Id: I08f278dce434050f013498327c7cbf3592512460
2013-08-01 17:45:35 -07:00
Ying Wang 949c4eb073 Delete the kernel file when build config is changed
Now we have products of the same device type but with different kernel,
and we want to do incremental build on them.

Bug: 10133257
Change-Id: Iff4aae11e474d2822f02c62822bd028a5ba5b47a
2013-08-01 15:46:25 -07:00
Ying Wang a8ae7f787d Error and exit if BUILD_MULTI_PREBUILT is incorrectly used
Bug: 10114476
Change-Id: Id51e7ca443c3742e17cbe114aefbb7ed3870b0e5
2013-07-31 16:26:01 -07:00
Ying Wang 172f5f5746 More verbose on what the build system is doing
Sometimes users get confused for long time of no message printed to the
screen.

Change-Id: I99d3b2954f3dcba47d5ee5dd9fd760578c0e0192
2013-07-31 12:22:57 -07:00
Jean-Baptiste Queru 8a7cd65585 am 50a402af: am f1534b62: Merge "Added generic hook for loading vendor specific defintions"
* commit '50a402af7ae550c96b9142ab56d3a23a8a8d22b1':
  Added generic hook for loading vendor specific defintions
2013-07-30 10:28:17 -07:00
Jean-Baptiste Queru 50a402af7a am f1534b62: Merge "Added generic hook for loading vendor specific defintions"
* commit 'f1534b6292a609bb5f55c4a617f3cd1054f90a81':
  Added generic hook for loading vendor specific defintions
2013-07-30 07:33:53 -07:00
Ying Wang 54d9cc3fac am cd9cadbc: am 7768c91c: am 94de1eba: Put a copy of the radio/bootloader files in the dist dir.
* commit 'cd9cadbcf68bfe07ac994e61aa00969572ae3fd5':
  Put a copy of the radio/bootloader files in the dist dir.
2013-07-26 13:00:20 -07:00
Ying Wang cd9cadbcf6 am 7768c91c: am 94de1eba: Put a copy of the radio/bootloader files in the dist dir.
* commit '7768c91c1c90e7c13390396d895a3afd5fda3e0f':
  Put a copy of the radio/bootloader files in the dist dir.
2013-07-26 12:57:19 -07:00
Ying Wang 7768c91c1c am 94de1eba: Put a copy of the radio/bootloader files in the dist dir.
* commit '94de1eba0e87297421789b339c5f26bf3e48eeb1':
  Put a copy of the radio/bootloader files in the dist dir.
2013-07-26 12:54:11 -07:00
Ying Wang 94de1eba0e Put a copy of the radio/bootloader files in the dist dir.
Bug: 10035750
Change-Id: I3b51e61ec737899d9264885a1e66c89a7a740d54
2013-07-26 12:19:20 -07:00
Marie Lennerhagen 9e5efceff9 Added generic hook for loading vendor specific defintions
Change-Id: I6dec9c378ed0aabf9e60f8dcb05c6043bbcc30e5
2013-07-26 18:12:36 +00:00
keunyoung a219bdc0ba fix build
- PDK_FUSION_OUT_DIR was null inside macro, lead into missing copy

bug: 10023069
Change-Id: I323d2fb6a2e955f9a7c27559701a7af36a89fea8
2013-07-25 18:22:43 -07:00
Ying Wang 5efaa72ac1 am 51aab877: am 5d1db8b4: Merge "Allow proto builds to pass in java proto params."
* commit '51aab8775ab86990abef411d00f5686e41022eee':
  Allow proto builds to pass in java proto params.
2013-07-25 17:04:20 -07:00
Ying Wang 51aab8775a am 5d1db8b4: Merge "Allow proto builds to pass in java proto params."
* commit '5d1db8b4335d554bfd7e028496f0305b78b0676b':
  Allow proto builds to pass in java proto params.
2013-07-25 15:36:07 -07:00
Ying Wang 7661c1d6f1 Merge "Add PRODUCT_BOOT_JARS to derive BOOTCLASSPATH" 2013-07-25 22:09:32 +00:00
Ulas Kirazci 6e485b545a Allow proto builds to pass in java proto params.
Change-Id: I65fe0cd96f818f59267da6159e6bd2ad28f07a11
2013-07-25 13:40:53 -07:00
Ulas Kirazci fcbc0b7f0b am 5094e33b: Merge "Revert "Allow proto builds to pass in java proto params.""
* commit '5094e33bddc5bb7ba8c63b725078764450b16973':
  Revert "Allow proto builds to pass in java proto params."
2013-07-25 13:35:27 -07:00
Ulas Kirazci 5094e33bdd Merge "Revert "Allow proto builds to pass in java proto params."" 2013-07-25 20:31:48 +00:00
Ulas Kirazci 24c7289d24 Revert "Allow proto builds to pass in java proto params."
This reverts commit 28b46fc16c.

Change-Id: Iaca9fa749c6f460911cc46e08e6b3ae2555b8bcc
2013-07-25 19:35:28 +00:00
Jean-Baptiste Queru 8959954976 am be581317: Merge "Change build id to OPENMASTER"
* commit 'be5813170364c382ca2fbc6500d567065449473e':
  Change build id to OPENMASTER
2013-07-25 09:07:19 -07:00
Chirayu Desai 0564d0ce33 Change build id to OPENMASTER
Change-Id: Ib1b2ea0303619753dace8a776295ad4e1ceab096
2013-07-25 21:26:32 +05:30
Ben Murdoch fc2bad5c36 Revert "Allow proto builds to pass in java proto params."
This reverts commit 28b46fc16c.

Speculative fix for master builds. I cannot repro the break the bots
are seeing locally, but it seems related to building protobufs and this
CL was in the first broken build.
2013-07-25 11:44:53 +01:00
Ulas Kirazci dd3d8f4ca9 am 6a5fc54f: am a825aa13: Merge "Allow proto builds to pass in java proto params."
* commit '6a5fc54fe9904214a7df1d34c9d48ad0310d867e':
  Allow proto builds to pass in java proto params.
2013-07-25 00:47:09 -07:00
Ying Wang 9352474dae am 6f9c87ed: am 45339b01: Merge "Use consistent search depth."
* commit '6f9c87ede60c52a42b107fa5fb06e0f2f654ca9f':
  Use consistent search depth.
2013-07-25 00:47:08 -07:00
Ulas Kirazci 6a5fc54fe9 am a825aa13: Merge "Allow proto builds to pass in java proto params."
* commit 'a825aa1329cbf28e23a9f7d96dbbe16f3f7ef9db':
  Allow proto builds to pass in java proto params.
2013-07-25 00:44:07 -07:00
Ying Wang 6f9c87ede6 am 45339b01: Merge "Use consistent search depth."
* commit '45339b01d61586aa46c4ca98b37e320879fac050':
  Use consistent search depth.
2013-07-25 00:44:07 -07:00
Ulas Kirazci a825aa1329 Merge "Allow proto builds to pass in java proto params." 2013-07-25 03:04:10 +00:00
Ying Wang 45339b01d6 Merge "Use consistent search depth." 2013-07-25 01:54:44 +00:00
Ulas Kirazci 28b46fc16c Allow proto builds to pass in java proto params.
Also source files which have dependencies need to be bundled together
(at least the way the build system is set up now). Move
--proto_path=$(TOP) to the end so that it does not take precedence
over user-supplied --proto_path flags.

Change-Id: Ia532647fe8811d39230a23ba3671685b0388cbe0
2013-07-24 18:02:57 -07:00
Scott Main c3faf216a4 am c5b665ad: am 0ce71df0: Merge "remove renderscript support lib from javadocs" into jb-mr2-ub-dev
* commit 'c5b665addf7f6a6ca7225b8f75bf419ada2ce74c':
  remove renderscript support lib from javadocs
2013-07-24 16:27:49 -07:00
Scott Main c5b665addf am 0ce71df0: Merge "remove renderscript support lib from javadocs" into jb-mr2-ub-dev
* commit '0ce71df0fccdb10c36823307fad7a71c7cd4d4d4':
  remove renderscript support lib from javadocs
2013-07-24 16:20:04 -07:00
Ying Wang 0650d1503d Add PRODUCT_BOOT_JARS to derive BOOTCLASSPATH
- BOOTCLASSPATH now is product-configurable;
- No need to maintain the duplicate values in core/dex_preopt.mk.
- clean up some legacy ALL_PREBUILTs.
Bug: 9990214

Change-Id: Ie3953e66d282e335bb7782b0ebd56102c35ec10e
2013-07-24 15:15:55 -07:00
Keun-young Park efc88c0596 Merge "Fix issue with DEBUG_OUT_DIR not properly selected" 2013-07-24 22:06:49 +00:00
Tom Cherry 60767620c3 Fix issue with DEBUG_OUT_DIR not properly selected
- patch from NVDIA

bug: 9968564

Change-Id: I2082f989d75fb168fb42947d723de093beff4ff1
Reviewed-by: Dan Willemsen <dwillemsen@nvidia.com>
Reviewed-by: Thomas Cherry <tcherry@nvidia.com>
Reviewed-by: Simone Willett <swillett@nvidia.com>
2013-07-24 13:55:56 -07:00
Scott Main 5b743677eb remove renderscript support lib from javadocs
Change-Id: I6b06bdcdae79442dbf471816cd1cf6f90873f1b2
2013-07-23 21:00:50 -07:00
Doug Zongker 1f790c9733 Merge "distinguish signed and unsigned user builds in UI" 2013-07-23 19:10:05 +00:00
Guilhem IMBERTON 58570e7d5e Use consistent search depth.
AndroidProducts.mk allows for a maxdepth of 4 in device and vendor while
vendorsetup.sh and BoardConfig.mk only allow for smaller depth.

Make search depth consistent for these files.

Change-Id: I406770c1423d4f27fe097956a7c705a0da937e35
Signed-off-by: Beare, Bruce J <bruce.j.beare@intel.com>
Signed-off-by: Laurent Fert <laurent.fert@intel.com>
Signed-off-by: Guilhem Imberton <guilhem.imberton@intel.com>
Author: Laurent Fert <laurent.fert@intel.com>
2013-07-23 21:02:15 +02:00
Doug Zongker a8608a7f7c distinguish signed and unsigned user builds in UI
Add "dev-keys" or "test-keys" to the value of ro.build.display.id for
user builds.  (This is the property that is displayed under "Build
number" in the Settings UI.)  Modify the signing script to remove the
keys tag from this value when signing.

Change-Id: I3d9d92056f8567d7f84b1be047619be7c6e4c419
2013-07-23 11:51:04 -07:00
keunyoung 3939476ca0 Merge "add PDK_PLATFORM_ZIP_PRODUCT_BINARIES to allow adding product specific binaries to platform.zip" 2013-07-22 23:46:10 +00:00
keunyoung c01780611a add PDK_PLATFORM_ZIP_PRODUCT_BINARIES to allow adding product specific binaries to platform.zip
- This can be used to deliver stuffs like kernel symbol file.
- Files are added in relative path from the top of android source tree.
- PDK_PLATFORM_ZIP_PRODUCT_BINARIES will be defined in BoardConfig.mk.
- files under out dir will be rejected to prevent possible conflicts.

bug: 9963432
Change-Id: Id1da643534cd86939df4941f39e4414d343bba99
2013-07-22 15:59:33 -07:00
Michael Runge 065ab7f0df Merge "Revert "Update OTA to understand SELinux filesystem labels"" 2013-07-22 21:57:00 +00:00