OSDN Git Service
Ying Wang [Tue, 10 Dec 2013 19:38:13 +0000 (19:38 +0000)]
am
68abe34c: am
c2f639a1: Merge "Add "-encoding UTF-8" option to javadoc."
* commit '
68abe34c9838993af5c0c6dbc4017c3cd8d7e86c':
Add "-encoding UTF-8" option to javadoc.
Ying Wang [Tue, 10 Dec 2013 19:36:18 +0000 (11:36 -0800)]
am
c2f639a1: Merge "Add "-encoding UTF-8" option to javadoc."
* commit '
c2f639a179b3085c7f61a8d71d2ee7b3ff6c9266':
Add "-encoding UTF-8" option to javadoc.
Ying Wang [Tue, 10 Dec 2013 19:32:57 +0000 (19:32 +0000)]
Merge "Add "-encoding UTF-8" option to javadoc."
Ying Wang [Tue, 10 Dec 2013 19:29:25 +0000 (11:29 -0800)]
Add "-encoding UTF-8" option to javadoc.
This fixed docs build on Mac OS X 10.9 with Java 7.
Change-Id: I91e224456c9e6c43dbf13d691c3b37d21f94b0f3
David Friedman [Tue, 10 Dec 2013 16:36:14 +0000 (16:36 +0000)]
am
e8db5f69: am
c25aee29: Added a row for the "All platforms" download line (rebuild stl with debug info package)
* commit '
e8db5f69d1d06d575ebbe62e6a79ea3b7a077870':
Added a row for the "All platforms" download line (rebuild stl with debug info package)
David Friedman [Tue, 10 Dec 2013 16:33:13 +0000 (08:33 -0800)]
am
c25aee29: Added a row for the "All platforms" download line (rebuild stl with debug info package)
* commit '
c25aee29298f1c1658fb274be15724ce60c0b93e':
Added a row for the "All platforms" download line (rebuild stl with debug info package)
David Friedman [Fri, 6 Dec 2013 10:23:14 +0000 (02:23 -0800)]
Added a row for the "All platforms" download line (rebuild stl with debug info package)
Change-Id: I333912e697a389b52b5c768e1218b7d146775c9f
Daniel Tsai [Thu, 17 Oct 2013 08:20:56 +0000 (16:20 +0800)]
build: Fix failed to assign a module name different with it's file name to a prebuilt module
Build system can not find the dependent library if assigning a
multi-prebuilt which module name is different with it's library
file name as following:
PREBUILT_LIBS := libabc_debug:libabc.a
Change-Id: I05bdc8cebcabf74195198e3cefa1b8923f87d406
Narayan Kamath [Fri, 6 Dec 2013 17:20:21 +0000 (17:20 +0000)]
am
b8d3879e: am
99bb0365: am
948206c0: Merge "Fix tools path on Mac OS for java 7."
* commit '
b8d3879e6298b3800d959aaf7fe9ed1a2a163ff7':
Fix tools path on Mac OS for java 7.
Narayan Kamath [Fri, 6 Dec 2013 17:20:20 +0000 (17:20 +0000)]
am
0e4cccbf: am
a8dcc8c8: am
fe57f665: Merge "A few more Java7 related clean ups."
* commit '
0e4cccbff61dc77e68f0dd13e5c96432febe82bb':
A few more Java7 related clean ups.
Narayan Kamath [Fri, 6 Dec 2013 17:16:18 +0000 (09:16 -0800)]
am
99bb0365: am
948206c0: Merge "Fix tools path on Mac OS for java 7."
* commit '
99bb0365d53186c8ece6ac4e61ca2d303d0e0f0a':
Fix tools path on Mac OS for java 7.
Narayan Kamath [Fri, 6 Dec 2013 17:16:18 +0000 (09:16 -0800)]
am
a8dcc8c8: am
fe57f665: Merge "A few more Java7 related clean ups."
* commit '
a8dcc8c81a567902bee69a8dcd7357d391ef39b9':
A few more Java7 related clean ups.
Narayan Kamath [Fri, 6 Dec 2013 17:13:58 +0000 (09:13 -0800)]
am
948206c0: Merge "Fix tools path on Mac OS for java 7."
* commit '
948206c026c8751b9d53341dfe9c2c2905ebb002':
Fix tools path on Mac OS for java 7.
Narayan Kamath [Fri, 6 Dec 2013 17:13:58 +0000 (09:13 -0800)]
am
fe57f665: Merge "A few more Java7 related clean ups."
* commit '
fe57f665074665edf469ad1e1d0fcef749f9a5bb':
A few more Java7 related clean ups.
Narayan Kamath [Fri, 6 Dec 2013 17:11:08 +0000 (17:11 +0000)]
Merge "Fix tools path on Mac OS for java 7."
Narayan Kamath [Fri, 6 Dec 2013 17:10:52 +0000 (17:10 +0000)]
Merge "A few more Java7 related clean ups."
The Android Open Source Project [Fri, 6 Dec 2013 01:30:15 +0000 (01:30 +0000)]
The Android Open Source Project [Fri, 6 Dec 2013 01:24:53 +0000 (17:24 -0800)]
The Android Open Source Project [Thu, 5 Dec 2013 20:59:39 +0000 (12:59 -0800)]
Merge commit '
d54f8c2d1b4d88db84465fee93aa29103ca32078' into HEAD
Change-Id: I3cf53f083dee277a450dac36b011bc83180f6294
Ying Wang [Thu, 5 Dec 2013 20:33:37 +0000 (20:33 +0000)]
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.
Ying Wang [Thu, 5 Dec 2013 20:33:37 +0000 (20:33 +0000)]
am
730511d9: am
3bd3693d: Merge "Delete board config for the unused "emulator" device."
* commit '
730511d9c4450b20eb2bc8d47d049ee3dbd982b1':
Delete board config for the unused "emulator" device.
Ying Wang [Thu, 5 Dec 2013 20:33:36 +0000 (20:33 +0000)]
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
Ying Wang [Thu, 5 Dec 2013 20:25:33 +0000 (12:25 -0800)]
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.
Ying Wang [Thu, 5 Dec 2013 20:25:32 +0000 (12:25 -0800)]
am
3bd3693d: Merge "Delete board config for the unused "emulator" device."
* commit '
3bd3693dd0a0b514d6b1e9cbce052dee1940166b':
Delete board config for the unused "emulator" device.
Ying Wang [Thu, 5 Dec 2013 20:25:31 +0000 (12:25 -0800)]
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
Ying Wang [Thu, 5 Dec 2013 19:14:20 +0000 (19:14 +0000)]
Merge "Push wpa_supplicant modules down to the leaf product config."
Ying Wang [Thu, 5 Dec 2013 19:14:11 +0000 (19:14 +0000)]
Merge "Delete board config for the unused "emulator" device."
Ying Wang [Thu, 5 Dec 2013 19:14:01 +0000 (19:14 +0000)]
Merge "Explictly set WPA_SUPPLICANT_VERSION := VER_0_8_X for the generic devices"
Ying Wang [Thu, 5 Dec 2013 18:47:28 +0000 (18:47 +0000)]
am
2d76eae8: am
c404d342: am
7493c39e: Add utility function find-files-in-subdirs
* commit '
2d76eae8270eb992bd70e723b7ed42af85cc2fe9':
Add utility function find-files-in-subdirs
Ying Wang [Thu, 5 Dec 2013 18:43:51 +0000 (10:43 -0800)]
am
c404d342: am
7493c39e: Add utility function find-files-in-subdirs
* commit '
c404d34282cabb3b9818cbf8020af18797ce8c6f':
Add utility function find-files-in-subdirs
Ying Wang [Thu, 5 Dec 2013 18:39:42 +0000 (10:39 -0800)]
am
7493c39e: Add utility function find-files-in-subdirs
* commit '
7493c39eff203ed027b0f0ea320c26dd7d895b22':
Add utility function find-files-in-subdirs
Ying Wang [Thu, 5 Dec 2013 00:04:49 +0000 (16:04 -0800)]
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
85898bca9969ec30c746cc852394bbae0195edbc)
Ying Wang [Mon, 25 Nov 2013 20:56:25 +0000 (12:56 -0800)]
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
Ying Wang [Mon, 25 Nov 2013 19:16:13 +0000 (11:16 -0800)]
Delete board config for the unused "emulator" device.
Change-Id: I1e1d47fece4113be9f31f04775c5b310d28017e3
Ying Wang [Mon, 25 Nov 2013 18:42:17 +0000 (10:42 -0800)]
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
Narayan Kamath [Thu, 5 Dec 2013 15:20:41 +0000 (15:20 +0000)]
Fix tools path on Mac OS for java 7.
Change-Id: Ieb72b9e10771ee372bacf20258242cb006c29fef
Ying Wang [Thu, 5 Dec 2013 14:24:43 +0000 (14:24 +0000)]
am
e2d5b777: am
e65c2969: Merge "Add utility function find-files-in-subdirs"
* commit '
e2d5b7772b0d4de8220f08e35430ea1bba3a9fcc':
Add utility function find-files-in-subdirs
Ying Wang [Thu, 5 Dec 2013 14:22:37 +0000 (06:22 -0800)]
am
e65c2969: Merge "Add utility function find-files-in-subdirs"
* commit '
e65c29697ac2cad422a094720944d326128f17c3':
Add utility function find-files-in-subdirs
Narayan Kamath [Thu, 5 Dec 2013 12:26:35 +0000 (12:26 +0000)]
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
Ying Wang [Thu, 5 Dec 2013 02:40:31 +0000 (02:40 +0000)]
Merge "Add utility function find-files-in-subdirs"
Ying Wang [Thu, 5 Dec 2013 00:04:49 +0000 (16:04 -0800)]
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
Xavier Ducrohet [Wed, 4 Dec 2013 21:35:40 +0000 (21:35 +0000)]
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.
Xavier Ducrohet [Wed, 4 Dec 2013 21:33:41 +0000 (13:33 -0800)]
am
8eb89dde: am
ab92f3df: Add Dialer to SDK system image. DO NOT MERGE.
* commit '
8eb89dde9b1c4da0aa0d116ef05e12c38873b756':
Add Dialer to SDK system image. DO NOT MERGE.
Xavier Ducrohet [Wed, 4 Dec 2013 21:30:08 +0000 (13:30 -0800)]
am
ab92f3df: Add Dialer to SDK system image. DO NOT MERGE.
* commit '
ab92f3dff0eb87a8aed4fdbcf1e16b71fd026daf':
Add Dialer to SDK system image. DO NOT MERGE.
Xavier Ducrohet [Wed, 4 Dec 2013 21:25:31 +0000 (13:25 -0800)]
Add Dialer to SDK system image. DO NOT MERGE.
Change-Id: I4f15482385c869a4ae08d99ae98bffc7c113acd7
Joe Onorato [Wed, 4 Dec 2013 17:47:10 +0000 (17:47 +0000)]
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
Joe Onorato [Wed, 4 Dec 2013 17:43:06 +0000 (09:43 -0800)]
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
Joe Onorato [Wed, 4 Dec 2013 10:31:18 +0000 (02:31 -0800)]
Add a convenient target for building a zip file of javadocs: $(LOCAL_MODULE)-docs.zip
Change-Id: I97fcc0d467f3b7582570b9be7e15acc0a5b550a5
Dave Langemak [Tue, 3 Dec 2013 23:30:42 +0000 (23:30 +0000)]
Dave Langemak [Tue, 3 Dec 2013 23:27:52 +0000 (15:27 -0800)]
Dave Langemak [Tue, 3 Dec 2013 23:24:24 +0000 (15:24 -0800)]
Dave Langemak [Tue, 3 Dec 2013 23:06:56 +0000 (15:06 -0800)]
.1 becomes .2
Change-Id: Ib4208e24e66b05ff441302a817be22ea213eb1df
Colin Cross [Tue, 3 Dec 2013 17:44:07 +0000 (17:44 +0000)]
Merge "Disable recovery in PDK builds" into klp-volantis-dev
Doug Zongker [Tue, 3 Dec 2013 16:58:11 +0000 (08:58 -0800)]
am
57c9ffef: am
9b23f2cd: add option to generate two-step recovery files
* commit '
57c9ffef30a6f34e126d8e89a08d208b05cc4901':
add option to generate two-step recovery files
Doug Zongker [Tue, 3 Dec 2013 16:56:05 +0000 (08:56 -0800)]
am
9b23f2cd: add option to generate two-step recovery files
* commit '
9b23f2cd786b46991b7c0198e69264b17875288d':
add option to generate two-step recovery files
Mike Lockwood [Wed, 23 Oct 2013 15:00:42 +0000 (08:00 -0700)]
Disable recovery in PDK builds
Change-Id: Ic6ee44cef37104c8d7facc28dfe45d0ef832ebd0
Dirk Dougherty [Tue, 3 Dec 2013 01:12:41 +0000 (17:12 -0800)]
am
d239e4c9: Support generated samples_toc.cs file.
* commit '
d239e4c9b5c154129d67bec9cd7b37b2720bf2b6':
Support generated samples_toc.cs file.
Dirk Dougherty [Mon, 25 Nov 2013 19:35:03 +0000 (11:35 -0800)]
Support generated samples_toc.cs file.
Change-Id: I34eeffbc98f729e13de805e7bbb9dac96d13fdd8
Ying Wang [Mon, 2 Dec 2013 22:26:45 +0000 (14:26 -0800)]
am
6178f6f0: Merge "Run ar in Deterministic mode."
* commit '
6178f6f0182b0b9c8063123dd62e86108eb7a212':
Run ar in Deterministic mode.
Ying Wang [Mon, 2 Dec 2013 22:19:27 +0000 (22:19 +0000)]
Merge "Run ar in Deterministic mode."
Ying Wang [Mon, 2 Dec 2013 22:13:02 +0000 (14:13 -0800)]
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
Ying Wang [Mon, 2 Dec 2013 19:22:26 +0000 (11:22 -0800)]
am
7a772619: Merge "core: support make 4.00"
* commit '
7a77261988354b13996e5ba84b87351b571a5a52':
core: support make 4.00
Ying Wang [Mon, 2 Dec 2013 19:16:02 +0000 (19:16 +0000)]
Merge "core: support make 4.00"
Stephen Hines [Wed, 27 Nov 2013 23:26:48 +0000 (15:26 -0800)]
am
65ca752a: Merge "Add FORCE_BUILD_RS_COMPAT option."
* commit '
65ca752aa18d6cd24196b5ba0fd6f53af49f8c56':
Add FORCE_BUILD_RS_COMPAT option.
Stephen Hines [Wed, 27 Nov 2013 23:18:22 +0000 (23:18 +0000)]
Merge "Add FORCE_BUILD_RS_COMPAT option."
Stephen Hines [Mon, 30 Sep 2013 22:57:36 +0000 (15:57 -0700)]
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
Doug Zongker [Mon, 25 Nov 2013 22:44:12 +0000 (14:44 -0800)]
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
Elliott Hughes [Tue, 26 Nov 2013 18:57:07 +0000 (10:57 -0800)]
am
66153e38: Merge "Switch x86 over to uapi-only."
* commit '
66153e38b0fb9525ff6a63eb757b79694b8ad5e2':
Switch x86 over to uapi-only.
Elliott Hughes [Tue, 26 Nov 2013 18:51:47 +0000 (18:51 +0000)]
Merge "Switch x86 over to uapi-only."
Narayan Kamath [Tue, 26 Nov 2013 18:08:49 +0000 (10:08 -0800)]
am
7519d737: Merge "Add experimental flag to support OpenJDK builds."
* commit '
7519d7378052be1824c06c2b6d5cee07874e2b45':
Add experimental flag to support OpenJDK builds.
Ying Wang [Tue, 26 Nov 2013 18:05:24 +0000 (10:05 -0800)]
am
0b25d9fa: Merge "Change build id to OPENMASTER"
* commit '
0b25d9fa70931a544a04cd7ba3f587bd2473c43a':
Change build id to OPENMASTER
Ying Wang [Tue, 26 Nov 2013 18:05:23 +0000 (10:05 -0800)]
am
7738e721: (-s ours) Merge "Version number change for AOSP master"
* commit '
7738e721fa7f80394632eb1d6591845f8fa03853':
Version number change for AOSP master
Narayan Kamath [Tue, 26 Nov 2013 18:01:17 +0000 (18:01 +0000)]
Merge "Add experimental flag to support OpenJDK builds."
Ying Wang [Tue, 26 Nov 2013 17:51:11 +0000 (17:51 +0000)]
Merge "Change build id to OPENMASTER"
Ying Wang [Tue, 26 Nov 2013 17:50:35 +0000 (17:50 +0000)]
Merge "Version number change for AOSP master"
Elliott Hughes [Tue, 26 Nov 2013 16:38:36 +0000 (08:38 -0800)]
am
46288040: Merge "Switch MIPS over to uapi-only."
* commit '
462880407efd121f2aa07850840f7b4d20d40d08':
Switch MIPS over to uapi-only.
Ying Wang [Sat, 21 Sep 2013 00:11:43 +0000 (17:11 -0700)]
Add experimental flag to support OpenJDK builds.
bug:
8992787
(cherry picked from commit
d1dbe7f5a23bacdff086b4992e1d31a96da706c3)
Change-Id: Ie977d4f26ae8d3eee9d7b9cf2c0c270bee5b54b3
Chirayu Desai [Mon, 25 Nov 2013 10:07:38 +0000 (15:37 +0530)]
Version number change for AOSP master
Change-Id: I49ef02f99c6428bc538ba3839a0314d977f65e07
Elliott Hughes [Tue, 26 Nov 2013 00:51:54 +0000 (00:51 +0000)]
Merge "Switch MIPS over to uapi-only."
Elliott Hughes [Tue, 26 Nov 2013 00:38:47 +0000 (16:38 -0800)]
Switch x86 over to uapi-only.
Bug:
11559337
Change-Id: I95aa40ec2094acdaef1d4b4d9f0dd6278cf558d1
Elliott Hughes [Mon, 25 Nov 2013 22:01:10 +0000 (14:01 -0800)]
Switch MIPS over to uapi-only.
Bug:
11559337
Change-Id: I04b93d0d681ddf75573cdeca2d25ffa44862a35f
Elliott Hughes [Mon, 25 Nov 2013 21:47:06 +0000 (13:47 -0800)]
am
a5b55c27: Merge "Add a "reverse AUX hack" for ARM."
* commit '
a5b55c27c0a8199d42d1b03ef013baa9620e2bc2':
Add a "reverse AUX hack" for ARM.
Elliott Hughes [Mon, 25 Nov 2013 21:42:12 +0000 (21:42 +0000)]
Merge "Add a "reverse AUX hack" for ARM."
Dave Allison [Mon, 25 Nov 2013 21:30:49 +0000 (13:30 -0800)]
am
014a3c0d: Add support for instruction set features
* commit '
014a3c0d6268c5e167a8fad39c8d24b962101d0a':
Add support for instruction set features
Dave Allison [Thu, 31 Oct 2013 18:44:47 +0000 (11:44 -0700)]
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
5174bb052986e9d90b597824a7e7b9ee2dfc8668)
Change-Id: I45af3b59752a48897bff2dd468b74f3ea73000be
Elliott Hughes [Mon, 25 Nov 2013 19:46:40 +0000 (11:46 -0800)]
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
Ying Wang [Mon, 25 Nov 2013 19:06:59 +0000 (11:06 -0800)]
am
3821622f: Merge "Rework the generation of host java libraries."
* commit '
3821622fc7e6ed03973d4b85a10ad23261ba12ef':
Rework the generation of host java libraries.
Ying Wang [Mon, 25 Nov 2013 19:01:43 +0000 (19:01 +0000)]
Merge "Rework the generation of host java libraries."
Narayan Kamath [Mon, 28 Oct 2013 13:20:52 +0000 (13:20 +0000)]
Rework the generation of host java libraries.
We currently have two types of host libraries, those
meant for the host VM (Sun, OpenJDK etc.) and those meant
for a host dalvik build. The former need to be compiled
against the host standard libraries and the latter need
to be compiled against libcore. This change introduces
two new build rules to complement the existing the existing
host rules.
BUILD_HOST_DALVIK_JAVA_LIBRARY : Build a java library for
a host build of dalvik. Bootclasspath will be set to a host
build of libcore.
BUILD_HOST_DALVIK_STATIC_JAVA_LIBRARY : Build a static java
library for a host build of dalvik. Bootclasspath will be set
to a host build of libcore.
This change also removes support for the LOCAL_BUILD_HOST_DEX
flag, which is now unnecessary.
bug:
8992787
(cherry picked from commit
0dd273a3f68364045c0e8bdcc10a4ecd3c07b745)
Change-Id: I3569fff8eaa4d26d55fcc317bd98471f55d74c14
Chirayu Desai [Fri, 16 Nov 2012 11:41:17 +0000 (17:11 +0530)]
Change build id to OPENMASTER
Change-Id: I2ca9b8de815c9c9e7e9d4c5a616e4ae270992761
The Android Open Source Project [Sat, 23 Nov 2013 01:30:36 +0000 (17:30 -0800)]
Doug Zongker [Fri, 22 Nov 2013 21:43:05 +0000 (13:43 -0800)]
am
b480d152: am
816d73f9: store releasetools.py in the target_files zip
* commit '
b480d1529e10b608c590a87839cfbafc46b2caed':
store releasetools.py in the target_files zip
Doug Zongker [Fri, 22 Nov 2013 21:39:48 +0000 (13:39 -0800)]
am
816d73f9: store releasetools.py in the target_files zip
* commit '
816d73f9ebfef7829ca60d9199a8b609cb1cb0cf':
store releasetools.py in the target_files zip
Doug Zongker [Fri, 22 Nov 2013 21:29:55 +0000 (13:29 -0800)]
store releasetools.py in the target_files zip
Save the device-specific releasetools.py module in the target_files
zip so that the OTA tools can use it without needing to get it from a
client.
Change-Id: I2dd5f4628290a8f2f56bd519b07d4ca8d92fddcd
The Android Open Source Project [Fri, 22 Nov 2013 19:06:11 +0000 (11:06 -0800)]
Merge commit '
c73341006286c391ae4d268a77f5e008045d5308' into HEAD
Change-Id: I4bf7d32d65e19dfa1f0533fdd3b2295c50b13005
Dave Langemak [Fri, 22 Nov 2013 01:16:26 +0000 (17:16 -0800)]
am
8ea83e90: am
96f56b6f: Merge "Revert "Enable incremental builder to find files that moved, and try to process them via patch + rename, instead of delete + add."" into klp-dev
* commit '
8ea83e902d931591af37e747763e768e7a6990be':
Revert "Enable incremental builder to find files that moved, and try to process them via patch + rename, instead of delete + add."
Dave Langemak [Fri, 22 Nov 2013 01:11:44 +0000 (17:11 -0800)]
am
96f56b6f: Merge "Revert "Enable incremental builder to find files that moved, and try to process them via patch + rename, instead of delete + add."" into klp-dev
* commit '
96f56b6fcbe21c2786ec985bee252e5cd5c3190b':
Revert "Enable incremental builder to find files that moved, and try to process them via patch + rename, instead of delete + add."
Dave Langemak [Fri, 22 Nov 2013 01:08:52 +0000 (01:08 +0000)]
Merge "Revert "Enable incremental builder to find files that moved, and try to process them via patch + rename, instead of delete + add."" into klp-dev
Elliott Hughes [Fri, 22 Nov 2013 01:07:48 +0000 (17:07 -0800)]
am
a59b8545: am
e296f2c3: Merge "Switch mips to the uapi kernel headers."
* commit '
a59b8545cf1aa013cf87b9946e738e0add1f4536':
Switch mips to the uapi kernel headers.
Michael Runge [Fri, 22 Nov 2013 00:52:51 +0000 (00:52 +0000)]
Revert "Enable incremental builder to find files that moved, and try to process them via patch + rename, instead of delete + add."
This reverts commit
37335b42385970d957d48056145a3d4c4dbc6087.
Change-Id: I61cc125d3b08eaa300a7774b6607dbb43f0e7148