Commit graph

14735 commits

Author SHA1 Message Date
Ying Wang
817d803c65 Delete board config for the unused "emulator" device.
Change-Id: I1e1d47fece4113be9f31f04775c5b310d28017e3
2013-12-05 10:08:10 -08:00
Ying Wang
ab6b4e0e22 Explictly set WPA_SUPPLICANT_VERSION := VER_0_8_X for the generic devices
Since 558477c0b2a5a7db679c1ad7551d43e6364d1df2 in
external/wpa_supplicant_8 we don't have WPA_SUPPLICANT_VERSION default
to VER_0_8_X.
This fixes the SDK build.

Change-Id: Ib7a8e10705dc6b987b60b1308405e89eaa2a47c9
2013-12-05 10:07:38 -08:00
Narayan Kamath
ab2e2e792e Fix tools path on Mac OS for java 7.
Change-Id: Ieb72b9e10771ee372bacf20258242cb006c29fef
2013-12-05 17:56:23 +00:00
Ying Wang
e2d5b7772b am e65c2969: Merge "Add utility function find-files-in-subdirs"
* commit 'e65c29697ac2cad422a094720944d326128f17c3':
  Add utility function find-files-in-subdirs
2013-12-05 06:22:37 -08:00
Narayan Kamath
e2d27887be A few more Java7 related clean ups.
- Separate SDK checking from version checking and
  make messages clearer.
- Add explicit source & target versions for javac to
  make things clearer.
- Rename flag from EXPERIMENTAL_USE_JAVA7_OPENJDK to
  EXPERIMENTAL_USE_JAVA7.
- Allow Oracle JDK 1.7 to be used on Mac OS, since there's
  no official OpenJDK support for that platform.

Change-Id: I454d2c917ed78f03ec7559a99659fefe7e7d50f3
2013-12-05 13:23:06 +00:00
Ying Wang
e65c29697a Merge "Add utility function find-files-in-subdirs" 2013-12-05 02:40:32 +00:00
Ying Wang
7c8c7bd4b6 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:56:38 -08:00
Xavier Ducrohet
7a33b56429 am 8eb89dde: am ab92f3df: Add Dialer to SDK system image. DO NOT MERGE.
* commit '8eb89dde9b1c4da0aa0d116ef05e12c38873b756':
  Add Dialer to SDK system image. DO NOT MERGE.
2013-12-04 13:33:41 -08:00
Xavier Ducrohet
8eb89dde9b am ab92f3df: Add Dialer to SDK system image. DO NOT MERGE.
* commit 'ab92f3dff0eb87a8aed4fdbcf1e16b71fd026daf':
  Add Dialer to SDK system image. DO NOT MERGE.
2013-12-04 13:30:08 -08:00
Xavier Ducrohet
ab92f3dff0 Add Dialer to SDK system image. DO NOT MERGE.
Change-Id: I4f15482385c869a4ae08d99ae98bffc7c113acd7
2013-12-04 13:25:56 -08: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
Dirk Dougherty
8f6949b611 Doc change: Add tag for DevArt.
Change-Id: Id6ecac1587e311373b2f787fb86b85c2c9933183
2013-12-03 19:07:13 -08: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
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
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
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
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
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
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
Elliott Hughes
b88bdebcb9 Switch MIPS over to uapi-only.
Bug: 11559337
Change-Id: I04b93d0d681ddf75573cdeca2d25ffa44862a35f
2013-11-25 14:01:10 -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
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
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
7c40768ada am 3821622f: Merge "Rework the generation of host java libraries."
* commit '3821622fc7e6ed03973d4b85a10ad23261ba12ef':
  Rework the generation of host java libraries.
2013-11-25 11:06:59 -08:00
Ying Wang
3821622fc7 Merge "Rework the generation of host java libraries." 2013-11-25 19:01:43 +00:00