Commit graph

14954 commits

Author SHA1 Message Date
Ying Wang
d114d22040 Merge "Add utility function find-files-in-subdirs" 2013-12-05 00:53:02 +00:00
Ying Wang
85898bca99 Add utility function find-files-in-subdirs
find-files-in-subdirs uses utility find to find given files in the given
subdirs. This function uses $(1), instead of LOCAL_PATH as the base.

Change-Id: Ib76631c97acd257d651a580cbad767606874f5d0
2013-12-04 16:27:06 -08:00
Joe Onorato
dbbba1ad1f am e939cb5c: am 0df5e7b3: am 36b89ff9: Add a convenient target for building a zip file of javadocs: -docs.zip
* commit 'e939cb5cfe53ac150de6e9a16a3e29ed25f47c1e':
  Add a convenient target for building a zip file of javadocs: $(LOCAL_MODULE)-docs.zip
2013-12-04 17:50:46 +00:00
Joe Onorato
e939cb5cfe am 0df5e7b3: am 36b89ff9: Add a convenient target for building a zip file of javadocs: -docs.zip
* commit '0df5e7b365d8baa6f5a2f5a1113e1a20cdd0fe58':
  Add a convenient target for building a zip file of javadocs: $(LOCAL_MODULE)-docs.zip
2013-12-04 17:47:10 +00:00
Joe Onorato
0df5e7b365 am 36b89ff9: Add a convenient target for building a zip file of javadocs: -docs.zip
* commit '36b89ff93fe1fe55351564c258023255d70b6378':
  Add a convenient target for building a zip file of javadocs: $(LOCAL_MODULE)-docs.zip
2013-12-04 09:43:06 -08:00
Joe Onorato
36b89ff93f Add a convenient target for building a zip file of javadocs: $(LOCAL_MODULE)-docs.zip
Change-Id: I97fcc0d467f3b7582570b9be7e15acc0a5b550a5
2013-12-04 02:32:06 -08:00
Dave Langemak
aa7386a746 am b738b392: am c58cdd36: am 48130ea9: am 63ac2753: .1 becomes .2
* commit 'b738b392f4da0a4975aeec3cbd1b270bcd194b26':
  .1 becomes .2
2013-12-03 23:34:07 +00:00
Dave Langemak
b738b392f4 am c58cdd36: am 48130ea9: am 63ac2753: .1 becomes .2
* commit 'c58cdd36af224ac00c105255614e9e58bc8c02b6':
  .1 becomes .2
2013-12-03 23:30:42 +00:00
Dave Langemak
c58cdd36af am 48130ea9: am 63ac2753: .1 becomes .2
* commit '48130ea9dead7ab64a389b84aaf9d8a8597e3079':
  .1 becomes .2
2013-12-03 15:27:52 -08:00
Dave Langemak
48130ea9de am 63ac2753: .1 becomes .2
* commit '63ac27537893533eb067f9f2b51e44f82f908703':
  .1 becomes .2
2013-12-03 15:24:24 -08:00
Dave Langemak
63ac275378 .1 becomes .2
Change-Id: Ib4208e24e66b05ff441302a817be22ea213eb1df
2013-12-03 15:06:56 -08:00
Colin Cross
0094fb1a32 am 9781049c: Merge "Disable recovery in PDK builds" into klp-volantis-dev
* commit '9781049c4158ec6b8d9072a7f137ab0a41fb99a5':
  Disable recovery in PDK builds
2013-12-03 17:46:33 +00:00
Colin Cross
9781049c41 Merge "Disable recovery in PDK builds" into klp-volantis-dev 2013-12-03 17:44:08 +00:00
Doug Zongker
b00398a07e am a6fadb61: am 57c9ffef: am 9b23f2cd: add option to generate two-step recovery files
* commit 'a6fadb61cae38089bc534f3cb995b98689f796cb':
  add option to generate two-step recovery files
2013-12-03 17:06:04 +00:00
Doug Zongker
a6fadb61ca am 57c9ffef: am 9b23f2cd: add option to generate two-step recovery files
* commit '57c9ffef30a6f34e126d8e89a08d208b05cc4901':
  add option to generate two-step recovery files
2013-12-03 08:58:11 -08:00
Doug Zongker
57c9ffef30 am 9b23f2cd: add option to generate two-step recovery files
* commit '9b23f2cd786b46991b7c0198e69264b17875288d':
  add option to generate two-step recovery files
2013-12-03 08:56:05 -08:00
Mike Lockwood
2e9d15d0b6 Disable recovery in PDK builds
Change-Id: Ic6ee44cef37104c8d7facc28dfe45d0ef832ebd0
2013-12-02 23:20:53 -08:00
Dirk Dougherty
387aa8b5b1 am fc79229c: am d239e4c9: Support generated samples_toc.cs file.
* commit 'fc79229c7c09058be1064c61c2287cdc7cd366da':
  Support generated samples_toc.cs file.
2013-12-03 01:19:20 +00:00
Dirk Dougherty
fc79229c7c am d239e4c9: Support generated samples_toc.cs file.
* commit 'd239e4c9b5c154129d67bec9cd7b37b2720bf2b6':
  Support generated samples_toc.cs file.
2013-12-02 17:12:41 -08:00
Dirk Dougherty
d239e4c9b5 Support generated samples_toc.cs file.
Change-Id: I34eeffbc98f729e13de805e7bbb9dac96d13fdd8
2013-12-03 00:16:14 +00:00
Ying Wang
1fdef9f6f8 am 04324c27: am 6178f6f0: Merge "Run ar in Deterministic mode."
* commit '04324c2780b1377ada547a7027aec8c890b9db0e':
  Run ar in Deterministic mode.
2013-12-02 23:32:10 +00:00
Ying Wang
13ca2c7f5c am 71e5dd30: am 7a772619: Merge "core: support make 4.00"
* commit '71e5dd3055dc6a441ce20f0905f1b3893f79d27e':
  core: support make 4.00
2013-12-02 23:31:44 +00:00
Stephen Hines
8b06d6b7c6 am 8d282698: am 65ca752a: Merge "Add FORCE_BUILD_RS_COMPAT option."
* commit '8d28269837276155b6478346b26e97239bfd5639':
  Add FORCE_BUILD_RS_COMPAT option.
2013-12-02 23:31:10 +00:00
Ying Wang
04324c2780 am 6178f6f0: Merge "Run ar in Deterministic mode."
* commit '6178f6f0182b0b9c8063123dd62e86108eb7a212':
  Run ar in Deterministic mode.
2013-12-02 14:26:45 -08:00
Ying Wang
6178f6f018 Merge "Run ar in Deterministic mode." 2013-12-02 22:19:27 +00:00
Ying Wang
b2f39181c6 Run ar in Deterministic mode.
Unfortunately no such flag was found for the host ar on Mac OS X.
https://code.google.com/p/android/issues/detail?id=60705

Change-Id: Ic2f75c871f0b5ae3cf20c1255458f7b921054d67
2013-12-02 14:15:23 -08:00
Ying Wang
71e5dd3055 am 7a772619: Merge "core: support make 4.00"
* commit '7a77261988354b13996e5ba84b87351b571a5a52':
  core: support make 4.00
2013-12-02 11:22:26 -08:00
Ying Wang
7a77261988 Merge "core: support make 4.00" 2013-12-02 19:16:02 +00:00
Stephen Hines
8d28269837 am 65ca752a: Merge "Add FORCE_BUILD_RS_COMPAT option."
* commit '65ca752aa18d6cd24196b5ba0fd6f53af49f8c56':
  Add FORCE_BUILD_RS_COMPAT option.
2013-11-27 15:26:48 -08:00
Stephen Hines
65ca752aa1 Merge "Add FORCE_BUILD_RS_COMPAT option." 2013-11-27 23:18:23 +00:00
Stephen Hines
4e12f542be Add FORCE_BUILD_RS_COMPAT option.
This enables the .so libraries to be built for apps using the
RenderScript support library. Traditionally, we trim these .so
files from full platform builds.

Change-Id: I6f8e9b8d2b671338d3d5a5ac0bfcc60fd448688b
2013-11-27 14:54:15 -08:00
Doug Zongker
9b23f2cd78 add option to generate two-step recovery files
When run with the -2 option, ota_from_target_files will generate a
package (full or incremental) that does some extra reboots in order to
install the new recovery first, so that the rest of the installation
is done with the new recovery.  This can be useful if (say) the
package installation needs some features from the newer kernel.

For incremental packages, the verification phase is still done with
the old recovery.

This is only supported on devices where the misc partition is EMMC
(not MTD).

Two-step packages are slower to install and possibly confusing to
users (they will see their device reboot four times instead of twice),
so only use this option if necessary.

Change-Id: I3267d905e5e8eb1a1eb61bf48255b8b24ffc4ad1
2013-11-27 11:27:55 -08:00
Elliott Hughes
a09a9c11da am 38b14290: am 66153e38: Merge "Switch x86 over to uapi-only."
* commit '38b14290ea45d410969df9f62f5b39787586ca3a':
  Switch x86 over to uapi-only.
2013-11-27 10:47:45 -08:00
Narayan Kamath
245f618d9e resolved conflicts for merge of 61d57a4d to master
Change-Id: I87acac6414703757268e316432246ace305275cb
2013-11-27 18:41:29 +00:00
Ying Wang
28b41fcd01 am e475ee0c: (-s ours) am 0b25d9fa: Merge "Change build id to OPENMASTER"
* commit 'e475ee0ca4befed81e831b3ac7580d51fcf24171':
  Change build id to OPENMASTER
2013-11-26 15:20:00 -08:00
Ying Wang
b7a983cb9e am 3ff6488d: am 7738e721: (-s ours) Merge "Version number change for AOSP master"
* commit '3ff6488d0f7275a6f5147b7300daa95384627e1d':
  Version number change for AOSP master
2013-11-26 15:10:11 -08:00
Elliott Hughes
38b14290ea am 66153e38: Merge "Switch x86 over to uapi-only."
* commit '66153e38b0fb9525ff6a63eb757b79694b8ad5e2':
  Switch x86 over to uapi-only.
2013-11-26 10:57:07 -08:00
Elliott Hughes
66153e38b0 Merge "Switch x86 over to uapi-only." 2013-11-26 18:51:47 +00:00
Narayan Kamath
61d57a4d01 am 7519d737: Merge "Add experimental flag to support OpenJDK builds."
* commit '7519d7378052be1824c06c2b6d5cee07874e2b45':
  Add experimental flag to support OpenJDK builds.
2013-11-26 10:08:49 -08:00
Ying Wang
e475ee0ca4 am 0b25d9fa: Merge "Change build id to OPENMASTER"
* commit '0b25d9fa70931a544a04cd7ba3f587bd2473c43a':
  Change build id to OPENMASTER
2013-11-26 10:05:24 -08:00
Ying Wang
3ff6488d0f am 7738e721: (-s ours) Merge "Version number change for AOSP master"
* commit '7738e721fa7f80394632eb1d6591845f8fa03853':
  Version number change for AOSP master
2013-11-26 10:05:23 -08:00
Narayan Kamath
7519d73780 Merge "Add experimental flag to support OpenJDK builds." 2013-11-26 18:01:17 +00:00
Ying Wang
0b25d9fa70 Merge "Change build id to OPENMASTER" 2013-11-26 17:51:12 +00:00
Ying Wang
7738e721fa Merge "Version number change for AOSP master" 2013-11-26 17:50:35 +00:00
Ying Wang
dcf9f36d8f Merge "Also package the unobfuscated classes.jar into proguard-dic.zip" 2013-11-26 17:37:06 +00:00
Elliott Hughes
1e398e0281 am 9128d725: am 46288040: Merge "Switch MIPS over to uapi-only."
* commit '9128d7253d0684be3a2808c21f8b97c6f76f84d0':
  Switch MIPS over to uapi-only.
2013-11-26 08:42:22 -08:00
Elliott Hughes
9128d7253d am 46288040: Merge "Switch MIPS over to uapi-only."
* commit '462880407efd121f2aa07850840f7b4d20d40d08':
  Switch MIPS over to uapi-only.
2013-11-26 08:38:36 -08:00
Ying Wang
ad69099131 Add experimental flag to support OpenJDK builds.
bug: 8992787

(cherry picked from commit d1dbe7f5a2)

Change-Id: Ie977d4f26ae8d3eee9d7b9cf2c0c270bee5b54b3
2013-11-26 10:30:14 +00:00
Chirayu Desai
e131cf8486 Version number change for AOSP master
Change-Id: I49ef02f99c6428bc538ba3839a0314d977f65e07
2013-11-26 08:29:29 +05:30
Ying Wang
33d6459181 Also package the unobfuscated classes.jar into proguard-dic.zip
proguard-dic.zip is generated and stored on the build server for
apps-only build.

Bug: 11811736
Change-Id: I2629dd1e28515d3b02f455f19b030ae291136559
2013-11-25 17:39:50 -08:00