Commit Graph

14940 Commits

Author SHA1 Message Date
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
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
Elliott Hughes 462880407e Merge "Switch MIPS over to uapi-only." 2013-11-26 00:51:54 +00:00
Elliott Hughes e5df095b76 Switch x86 over to uapi-only.
Bug: 11559337
Change-Id: I95aa40ec2094acdaef1d4b4d9f0dd6278cf558d1
2013-11-25 16:38:47 -08:00
Ying Wang f30718aa3d Merge "Push wpa_supplicant modules down to the leaf product config." 2013-11-25 22:21:45 +00:00
Elliott Hughes b88bdebcb9 Switch MIPS over to uapi-only.
Bug: 11559337
Change-Id: I04b93d0d681ddf75573cdeca2d25ffa44862a35f
2013-11-25 14:01:10 -08:00
Ying Wang c1f8360248 Push wpa_supplicant modules down to the leaf product config.
Since 558477c0b2a5a7db679c1ad7551d43e6364d1df2 in
external/wpa_supplicant_8 we don't need those modules if
WPA_SUPPLICANT_VERSION is not set by the BoardConfig.mk.

Actually the generic devices don't need them.

Change-Id: Iff7c1fbf483bd16d5f898836c4e7401d56def80f
2013-11-25 13:59:46 -08:00
Elliott Hughes b5fdb3a947 am 3b54d5a5: am a5b55c27: Merge "Add a "reverse AUX hack" for ARM."
* commit '3b54d5a5fc492de5b28d905d0be36be66acec791':
  Add a "reverse AUX hack" for ARM.
2013-11-25 13:50:26 -08:00
Elliott Hughes 3b54d5a5fc am a5b55c27: Merge "Add a "reverse AUX hack" for ARM."
* commit 'a5b55c27c0a8199d42d1b03ef013baa9620e2bc2':
  Add a "reverse AUX hack" for ARM.
2013-11-25 13:47:06 -08:00
Elliott Hughes a5b55c27c0 Merge "Add a "reverse AUX hack" for ARM." 2013-11-25 21:42:12 +00:00
Dave Allison 77dcaa9377 am 797589d4: am 014a3c0d: Add support for instruction set features
* commit '797589d4e495359bda682a627da4ca32ff30f5a1':
  Add support for instruction set features
2013-11-25 13:36:12 -08:00
Dave Allison 797589d4e4 am 014a3c0d: Add support for instruction set features
* commit '014a3c0d6268c5e167a8fad39c8d24b962101d0a':
  Add support for instruction set features
2013-11-25 13:30:49 -08:00
Dave Allison 014a3c0d62 Add support for instruction set features
This adds the --instruction-set-features= arguments to the dex2oat
commands for the system images.  The feature set is determined at
build time

(cherry picked from commit 4145a2a20a0f275fe4c77e39d507cd5f8eb7a73b)

(cherry picked from commit 5174bb0529)

Change-Id: I45af3b59752a48897bff2dd468b74f3ea73000be
2013-11-25 12:27:24 -08:00
Ying Wang 4b5aaedcd0 Merge "Delete board config for the unused "emulator" device." 2013-11-25 20:11:35 +00:00
Elliott Hughes 9696acae02 Add a "reverse AUX hack" for ARM.
MIPS and x86 are almost completely switched over to uapi-only. ARM is still
currently old-only. A cleanup of the uapi headers over the weekend means
that the uapi-only <linux/kexec.h> is now in the right place, which will break
the ARM build unless the ARM build also looks in the uapi headers if it can't
find an old header.

Change-Id: Ie7a53ef2122b43cdef64b71d7b36a8381992a461
2013-11-25 12:06:25 -08:00
Ying Wang 63ab7d8119 Delete board config for the unused "emulator" device.
Change-Id: I1e1d47fece4113be9f31f04775c5b310d28017e3
2013-11-25 11:16:13 -08:00