Commit graph

13430 commits

Author SHA1 Message Date
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
Dirk Dougherty
45924686eb am 8574e7d9: am 48e3f1d6: Add new table rows for legacy ndk downloads.
* commit '8574e7d93e28069983da51ef40fa47bdc2e51daa':
  Add new table rows for legacy ndk downloads.
2013-07-25 17:04:24 -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
Ulas Kirazci
c7fda981ef am fcbc0b7f: am 5094e33b: Merge "Revert "Allow proto builds to pass in java proto params.""
* commit 'fcbc0b7f0b8f654414c97699b36e6356cbb4bb08':
  Revert "Allow proto builds to pass in java proto params."
2013-07-25 16:34:23 -07:00
Dirk Dougherty
8574e7d93e am 48e3f1d6: Add new table rows for legacy ndk downloads.
* commit '48e3f1d6e40581bc4379c180b9de6fdd41026eee':
  Add new table rows for legacy ndk downloads.
2013-07-25 16:12:55 -07:00
Dirk Dougherty
48e3f1d6e4 Add new table rows for legacy ndk downloads.
Change-Id: If8ebc459415a22719d351d87a55ddeb4ddb6b3ba
2013-07-25 15:54:26 -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
5d1db8b433 Merge "Allow proto builds to pass in java proto params." 2013-07-25 22:32:08 +00: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
2b0ee3f90d am 89599549: (-s ours) am be581317: Merge "Change build id to OPENMASTER"
* commit '8959954976b2b92c0b1935569cd963d292cd8e8c':
  Change build id to OPENMASTER
2013-07-25 09:11:50 -07: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
Jean-Baptiste Queru
be58131703 Merge "Change build id to OPENMASTER" 2013-07-25 16:01:45 +00: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
c5955bb1ef am 1a980beb: am 5430d20d: fix the api level filter (wasn\'t greying out APIs on page load)
* commit '1a980bebd48940688ae078e29f46b174a8c92e99':
  fix the api level filter (wasn't greying out APIs on page load)
2013-07-24 16:27:48 -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
Scott Main
1a980bebd4 am 5430d20d: fix the api level filter (wasn\'t greying out APIs on page load)
* commit '5430d20ddae54212a23325579f8de813f733db9a':
  fix the api level filter (wasn't greying out APIs on page load)
2013-07-24 16:20:02 -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
0ce71df0fc Merge "remove renderscript support lib from javadocs" into jb-mr2-ub-dev 2013-07-24 04:03:20 +00:00
Scott Main
5b743677eb remove renderscript support lib from javadocs
Change-Id: I6b06bdcdae79442dbf471816cd1cf6f90873f1b2
2013-07-23 21:00:50 -07:00
Scott Main
5430d20dda fix the api level filter (wasn't greying out APIs on page load)
Change-Id: Iaafe8c0652856eaff6725491f21581969e94f430
2013-07-23 20:48:54 -07:00
Brian Carlstrom
336b06f78c Enable runtime_libart on darwin.
Change-Id: I0499bb387af827379fa4bb5e71a9770a89093c53
2013-07-23 14:24:00 -07:00
Scott Main
0c1cd6865b am d039c5e2: am 701a07fd: remove margin changes for paragraphs in collapse container
* commit 'd039c5e27bdec1898709cb715e4410c885b218d3':
  remove margin changes for paragraphs in collapse container
2013-07-23 12:51:29 -07:00
Scott Main
d039c5e27b am 701a07fd: remove margin changes for paragraphs in collapse container
* commit '701a07fd33a14f63e6baf4d1dfa36fd7035a8259':
  remove margin changes for paragraphs in collapse container
2013-07-23 12:49:03 -07:00
Scott Main
701a07fd33 remove margin changes for paragraphs in collapse container
Change-Id: I5ee51699cb473334e1c3cfb520c8145466eea265
2013-07-23 12:41:25 -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
Michael Runge
fb9bb205fc Revert "Update OTA to understand SELinux filesystem labels"
This reverts commit fbbd79530a.

All incremental auto OTAs broken b/9964074

Change-Id: I500d2ac194804abd20a0e01d9862fd42e8f5d2de
2013-07-22 20:42:44 +00:00
The Android Open Source Project
9232a62e98 am 90a4ac4c: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
* commit '90a4ac4c1eafd897800c72fa8c732f97ffa95d28':
  "JSS15J"
2013-07-22 08:01:58 -07:00
The Android Open Source Project
90a4ac4c1e Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: I6f1b8561853187e3a82f0da2e428188c10e64807
2013-07-22 07:59:15 -07:00
The Android Automerger
d90fa5ddf5 "JSS15J" 2013-07-21 10:20:19 -07:00
The Android Open Source Project
df286ced88 am 62eda460: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
* commit '62eda460c411b21dce28b8ea6a9ee9245d896dd5':
  "JSS15I"
2013-07-20 18:26:47 -07:00