Commit graph

14705 commits

Author SHA1 Message Date
The Android Open Source Project
e67167f62e am 8e9369f3: am 722581a5: (-s ours) Merge commit \'d54f8c2d1b4d88db84465fee93aa29103ca32078\' into HEAD
* commit '8e9369f3c2324aa0ee385ab7bffc10dbd590e5bb':
2013-12-06 01:30:15 +00:00
The Android Open Source Project
8e9369f3c2 am 722581a5: (-s ours) Merge commit \'d54f8c2d1b4d88db84465fee93aa29103ca32078\' into HEAD
* commit '722581a59873a98d30f7af34300049d524c1783f':
2013-12-05 17:24:53 -08:00
The Android Open Source Project
722581a598 Merge commit 'd54f8c2d1b4d88db84465fee93aa29103ca32078' into HEAD
Change-Id: I3cf53f083dee277a450dac36b011bc83180f6294
2013-12-05 12:59:39 -08:00
Ying Wang
48feb167d5 am a395c6c1: am 18ee9e5e: Merge "Push wpa_supplicant modules down to the leaf product config."
* commit 'a395c6c1e424c7e5586dcc71d9df6d036aa0c3be':
  Push wpa_supplicant modules down to the leaf product config.
2013-12-05 20:33:37 +00:00
Ying Wang
d4e33c960b am 730511d9: am 3bd3693d: Merge "Delete board config for the unused "emulator" device."
* commit '730511d9c4450b20eb2bc8d47d049ee3dbd982b1':
  Delete board config for the unused "emulator" device.
2013-12-05 20:33:37 +00:00
Ying Wang
41e5c40106 am 404f32d1: am 1caa938a: Merge "Explictly set WPA_SUPPLICANT_VERSION := VER_0_8_X for the generic devices"
* commit '404f32d120dffc04ca19c1cc84c2491ef249764a':
  Explictly set WPA_SUPPLICANT_VERSION := VER_0_8_X for the generic devices
2013-12-05 20:33:36 +00:00
Ying Wang
a395c6c1e4 am 18ee9e5e: Merge "Push wpa_supplicant modules down to the leaf product config."
* commit '18ee9e5e7de08933a04137e560bff87b113adb21':
  Push wpa_supplicant modules down to the leaf product config.
2013-12-05 12:25:33 -08:00
Ying Wang
730511d9c4 am 3bd3693d: Merge "Delete board config for the unused "emulator" device."
* commit '3bd3693dd0a0b514d6b1e9cbce052dee1940166b':
  Delete board config for the unused "emulator" device.
2013-12-05 12:25:32 -08:00
Ying Wang
404f32d120 am 1caa938a: Merge "Explictly set WPA_SUPPLICANT_VERSION := VER_0_8_X for the generic devices"
* commit '1caa938a22606a55103318df82a31a92f47900da':
  Explictly set WPA_SUPPLICANT_VERSION := VER_0_8_X for the generic devices
2013-12-05 12:25:31 -08:00
Ying Wang
18ee9e5e7d Merge "Push wpa_supplicant modules down to the leaf product config." 2013-12-05 19:14:20 +00:00
Ying Wang
3bd3693dd0 Merge "Delete board config for the unused "emulator" device." 2013-12-05 19:14:11 +00:00
Ying Wang
1caa938a22 Merge "Explictly set WPA_SUPPLICANT_VERSION := VER_0_8_X for the generic devices" 2013-12-05 19:14:01 +00:00
Ying Wang
9eaf1477cf am 2d76eae8: am c404d342: am 7493c39e: Add utility function find-files-in-subdirs
* commit '2d76eae8270eb992bd70e723b7ed42af85cc2fe9':
  Add utility function find-files-in-subdirs
2013-12-05 18:47:28 +00:00
Ying Wang
2d76eae827 am c404d342: am 7493c39e: Add utility function find-files-in-subdirs
* commit 'c404d34282cabb3b9818cbf8020af18797ce8c6f':
  Add utility function find-files-in-subdirs
2013-12-05 10:43:51 -08:00
Ying Wang
c404d34282 am 7493c39e: Add utility function find-files-in-subdirs
* commit '7493c39eff203ed027b0f0ea320c26dd7d895b22':
  Add utility function find-files-in-subdirs
2013-12-05 10:39:42 -08:00
Ying Wang
7493c39eff 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
(cherry picked from commit 85898bca99)
2013-12-05 18:37:20 +00:00
Ying Wang
17fc3d2ac1 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

Conflicts:
	target/product/core_tiny.mk
2013-12-05 10:12:01 -08:00
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
Ying Wang
8df06ce0fa am e2d5b777: am e65c2969: Merge "Add utility function find-files-in-subdirs"
* commit 'e2d5b7772b0d4de8220f08e35430ea1bba3a9fcc':
  Add utility function find-files-in-subdirs
2013-12-05 14:24:43 +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
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
9c7281fbb2 am 7a33b564: am 8eb89dde: am ab92f3df: Add Dialer to SDK system image. DO NOT MERGE.
* commit '7a33b5642951910c9973d40f32bd40ab2682bf46':
  Add Dialer to SDK system image. DO NOT MERGE.
2013-12-04 21:35:40 +00: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
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
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
9781049c41 Merge "Disable recovery in PDK builds" into klp-volantis-dev 2013-12-03 17:44:08 +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
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