OSDN Git Service
Ying Wang [Thu, 18 Dec 2014 01:00:53 +0000 (17:00 -0800)]
Support to build AAR for static Java libraries.
Set up rules to build $(built_aar), if a static Java library has Android
resources.
If you run "tapas my_lib && make dist", my_lib.aar will be built and put
in the DIST_DIR.
Bug:
18759503
Change-Id: I36b912eb7bbab241fe48319115ea320efe77c705
Ying Wang [Wed, 17 Dec 2014 23:13:59 +0000 (23:13 +0000)]
am
c11da8eb: am
81d110ea: am
2902d458: Add support for prebuilt AARs.
* commit '
c11da8ebc5fea685902c02c001a071929250356d':
Add support for prebuilt AARs.
Ying Wang [Wed, 17 Dec 2014 22:43:13 +0000 (22:43 +0000)]
am
81d110ea: am
2902d458: Add support for prebuilt AARs.
* commit '
81d110ea5419fb904f37e545646b0523c514437c':
Add support for prebuilt AARs.
Ying Wang [Wed, 17 Dec 2014 22:37:53 +0000 (22:37 +0000)]
am
2902d458: Add support for prebuilt AARs.
* commit '
2902d4585f2a60a91084e96d00f2ee8d8301bf65':
Add support for prebuilt AARs.
Ying Wang [Wed, 29 Oct 2014 22:48:32 +0000 (15:48 -0700)]
Add support for prebuilt AARs.
- You can give a .aar as source file to a prebuilt static Java library
module. The build system will set up dependencies and rules to extract
classes.jar and other resource files.
- To build against a prebuilt AAR module, use:
LOCAL_STATIC_JAVA_AAR_LIBRARIES := <module names of aar prebuilt AARs>
The build system will set up rules to merge the library's
AndroidManifest.xml with the main AndroidManifest.xml, add the AAR's
resource dirs and link/merge the AAR's classes.jar.
Bug:
18168693
Change-Id: Ic2c1d20572a93bd98dbc72f8a39e26b459e442c2
(cherry picked from commit
e9dd9f2bfceed3b5f630b0edbe3feb7f34548d8b)
smain@google.com [Wed, 17 Dec 2014 20:37:45 +0000 (20:37 +0000)]
am
7ad7ff73: am
2ed92cda: am
19832ae1: am
d742274e: am
b05558cf: am
3de83c1b: make shadowbox video always centered to fit the window height
* commit '
7ad7ff73586416618997076a89105892832966d6':
make shadowbox video always centered to fit the window height
smain@google.com [Wed, 17 Dec 2014 20:32:27 +0000 (20:32 +0000)]
am
2ed92cda: am
19832ae1: am
d742274e: am
b05558cf: am
3de83c1b: make shadowbox video always centered to fit the window height
* commit '
2ed92cda0d807ee41f2821deb425f15a023c05b1':
make shadowbox video always centered to fit the window height
smain@google.com [Wed, 17 Dec 2014 20:27:00 +0000 (20:27 +0000)]
am
19832ae1: am
d742274e: am
b05558cf: am
3de83c1b: make shadowbox video always centered to fit the window height
* commit '
19832ae16afd9cf63e6fe02770d7bcee8a338f95':
make shadowbox video always centered to fit the window height
smain@google.com [Wed, 17 Dec 2014 20:20:20 +0000 (20:20 +0000)]
am
d742274e: am
b05558cf: am
3de83c1b: make shadowbox video always centered to fit the window height
* commit '
d742274e14a048805a74311b0e5a25e03fc2465c':
make shadowbox video always centered to fit the window height
Dan Albert [Wed, 17 Dec 2014 02:21:08 +0000 (02:21 +0000)]
am
818ce668: am
b3ad3943: Merge "Revert "Remove libstlport from PRODUCT_PACKAGES.""
* commit '
818ce6688d4b1b0fa50ebd7362371d624dd4c484':
Revert "Remove libstlport from PRODUCT_PACKAGES."
Tim Murray [Wed, 17 Dec 2014 02:21:07 +0000 (02:21 +0000)]
am
1d693cec: am
39a5bba4: Merge "disable Krait for Mac builds to avoid assembler issues"
* commit '
1d693cecc67cdbcde59d421ab60ef74f80505cf4':
disable Krait for Mac builds to avoid assembler issues
Dan Albert [Wed, 17 Dec 2014 01:18:27 +0000 (01:18 +0000)]
am
b3ad3943: Merge "Revert "Remove libstlport from PRODUCT_PACKAGES.""
* commit '
b3ad3943f363ab7c60d17125ac871e31c25b8a7a':
Revert "Remove libstlport from PRODUCT_PACKAGES."
Tim Murray [Wed, 17 Dec 2014 01:13:09 +0000 (01:13 +0000)]
am
39a5bba4: Merge "disable Krait for Mac builds to avoid assembler issues"
* commit '
39a5bba4726016b1d92c181cb464bfb0ffabab22':
disable Krait for Mac builds to avoid assembler issues
Dan Albert [Wed, 17 Dec 2014 01:08:01 +0000 (01:08 +0000)]
Merge "Revert "Remove libstlport from PRODUCT_PACKAGES.""
Tim Murray [Wed, 17 Dec 2014 00:59:21 +0000 (00:59 +0000)]
Merge "disable Krait for Mac builds to avoid assembler issues"
Dan Albert [Wed, 17 Dec 2014 00:03:31 +0000 (16:03 -0800)]
Revert "Remove libstlport from PRODUCT_PACKAGES."
The platform dependence on stlport is now far enough gone that a
regular build no longer builds stlport (woot!). Unfortunately, vendor
blobs don't claim their dependencies, so the build system has to keep
track of this for them.
Bug:
18777920
This reverts commit
ef11722e9b778ac6a0edca2f51b9e510e79416f9.
Change-Id: I6a0dd26dfc6837c419eb5dd2ec5258dd323fd4bf
Ying Wang [Tue, 16 Dec 2014 21:58:10 +0000 (21:58 +0000)]
am
912da645: am
73a730ca: Merge "Remove libdvm support from the core build system."
* commit '
912da64598a5175d6e5868c22977eda95f2a9df1':
Remove libdvm support from the core build system.
Brian Carlstrom [Tue, 16 Dec 2014 21:49:18 +0000 (21:49 +0000)]
am
c38439a5: am
8c5401c1: Merge "Remove obsolete PRODUCT_DEX_PREOPT_.*_IN_DATA"
* commit '
c38439a5fff55322900948cb36c2cf6f38b50bb3':
Remove obsolete PRODUCT_DEX_PREOPT_.*_IN_DATA
Ying Wang [Tue, 16 Dec 2014 21:47:13 +0000 (21:47 +0000)]
am
73a730ca: Merge "Remove libdvm support from the core build system."
* commit '
73a730caf566fb778ad36f6d991666c482918d22':
Remove libdvm support from the core build system.
Ying Wang [Tue, 16 Dec 2014 21:38:40 +0000 (21:38 +0000)]
Merge "Remove libdvm support from the core build system."
Brian Carlstrom [Tue, 16 Dec 2014 20:35:18 +0000 (20:35 +0000)]
am
8c5401c1: Merge "Remove obsolete PRODUCT_DEX_PREOPT_.*_IN_DATA"
* commit '
8c5401c1c6a5dfd87c4b0f0edc45810e35b93e40':
Remove obsolete PRODUCT_DEX_PREOPT_.*_IN_DATA
Brian Carlstrom [Tue, 16 Dec 2014 18:53:34 +0000 (18:53 +0000)]
Merge "Remove obsolete PRODUCT_DEX_PREOPT_.*_IN_DATA"
Ying Wang [Mon, 8 Dec 2014 22:46:29 +0000 (14:46 -0800)]
Remove libdvm support from the core build system.
Now libart is the only supported runtime and
we don't need the build variables PRODUCT_RUNTIMES and
DALVIK_VM_LIB.
Bug:
18465297
Change-Id: Ibfda931cde0649163d79b584fb5ccad927a9bc2b
Joe Fernandez [Tue, 16 Dec 2014 11:02:57 +0000 (11:02 +0000)]
am
9c45dd09: am
6437b637: am
5576ef5b: am
b96b2a4a: am
91f2ba64: am
a4417712: Merge "docs: SHA update in sdkpage.cs" into lmp-docs
* commit '
9c45dd092220dfe225fee406a7f9b999aedee1e6':
docs: SHA update in sdkpage.cs
smain@google.com [Tue, 16 Dec 2014 11:02:56 +0000 (11:02 +0000)]
am
2bfbd1d7: am
7d4e6bbe: am
96ac360b: am
2881d6f3: am
9f88a60d: am
481f15c1: set youtube player lang based on user pref and enable captions when not English
* commit '
2bfbd1d78089484be797cc6c6d2ee4fe93b05440':
set youtube player lang based on user pref and enable captions when not English
smain@google.com [Tue, 16 Dec 2014 11:02:55 +0000 (11:02 +0000)]
am
17884a53: am
5b566fb9: am
8f207ca0: am
2c3ae43f: am
29e06142: am
d24088c0: add analytics event to track from which page a video was started
* commit '
17884a531e5370fa2e2e0fe2591d7b3978272cae':
add analytics event to track from which page a video was started
smain@google.com [Tue, 16 Dec 2014 11:02:54 +0000 (11:02 +0000)]
am
e8f8ceaa: am
08810fc4: am
305f55cd: am
3ff2fd14: am
d7dbaf5c: am
ed677d7a: update analytics event for searches to make query case-insensitive and save the URL instead of doc title.
* commit '
e8f8ceaa4c435a1844773edce6609077a85cd777':
update analytics event for searches to make query case-insensitive and save the URL instead of doc title.
Brian Carlstrom [Tue, 16 Dec 2014 06:09:58 +0000 (22:09 -0800)]
Remove obsolete PRODUCT_DEX_PREOPT_.*_IN_DATA
Bug:
18673991
Change-Id: I64261ef6a37df92eeef8552b8fd0a67157e4a034
Joe Fernandez [Tue, 16 Dec 2014 03:53:58 +0000 (03:53 +0000)]
am
6437b637: am
5576ef5b: am
b96b2a4a: am
91f2ba64: am
a4417712: Merge "docs: SHA update in sdkpage.cs" into lmp-docs
* commit '
6437b637d192fa460945bed5d339395827784442':
docs: SHA update in sdkpage.cs
smain@google.com [Tue, 16 Dec 2014 03:53:57 +0000 (03:53 +0000)]
am
7d4e6bbe: am
96ac360b: am
2881d6f3: am
9f88a60d: am
481f15c1: set youtube player lang based on user pref and enable captions when not English
* commit '
7d4e6bbe83bb32f7d12cd8dc7deea318857967b7':
set youtube player lang based on user pref and enable captions when not English
smain@google.com [Tue, 16 Dec 2014 03:53:56 +0000 (03:53 +0000)]
am
5b566fb9: am
8f207ca0: am
2c3ae43f: am
29e06142: am
d24088c0: add analytics event to track from which page a video was started
* commit '
5b566fb92913983e7fa6a9ff75f287dd7ec1446d':
add analytics event to track from which page a video was started
smain@google.com [Tue, 16 Dec 2014 03:53:55 +0000 (03:53 +0000)]
am
08810fc4: am
305f55cd: am
3ff2fd14: am
d7dbaf5c: am
ed677d7a: update analytics event for searches to make query case-insensitive and save the URL instead of doc title.
* commit '
08810fc42c1545b1116f2c88cd1595756e9fe418':
update analytics event for searches to make query case-insensitive and save the URL instead of doc title.
Joe Fernandez [Tue, 16 Dec 2014 03:48:14 +0000 (03:48 +0000)]
am
5576ef5b: am
b96b2a4a: am
91f2ba64: am
a4417712: Merge "docs: SHA update in sdkpage.cs" into lmp-docs
* commit '
5576ef5b7162ca156456b87939964361da88cec6':
docs: SHA update in sdkpage.cs
smain@google.com [Tue, 16 Dec 2014 03:48:13 +0000 (03:48 +0000)]
am
96ac360b: am
2881d6f3: am
9f88a60d: am
481f15c1: set youtube player lang based on user pref and enable captions when not English
* commit '
96ac360b399d073e0764759bf53973bebd8da66b':
set youtube player lang based on user pref and enable captions when not English
smain@google.com [Tue, 16 Dec 2014 03:48:12 +0000 (03:48 +0000)]
am
8f207ca0: am
2c3ae43f: am
29e06142: am
d24088c0: add analytics event to track from which page a video was started
* commit '
8f207ca0460c7df2f5ce3b5005312e945c4e48e2':
add analytics event to track from which page a video was started
smain@google.com [Tue, 16 Dec 2014 03:48:11 +0000 (03:48 +0000)]
am
305f55cd: am
3ff2fd14: am
d7dbaf5c: am
ed677d7a: update analytics event for searches to make query case-insensitive and save the URL instead of doc title.
* commit '
305f55cd29c37b048083b97ddcae2894a0325c6c':
update analytics event for searches to make query case-insensitive and save the URL instead of doc title.
Joe Fernandez [Tue, 16 Dec 2014 03:42:03 +0000 (03:42 +0000)]
am
b96b2a4a: am
91f2ba64: am
a4417712: Merge "docs: SHA update in sdkpage.cs" into lmp-docs
* commit '
b96b2a4ae621e1bd8529ef50bc00ddc048207ca3':
docs: SHA update in sdkpage.cs
smain@google.com [Tue, 16 Dec 2014 03:41:58 +0000 (03:41 +0000)]
am
2881d6f3: am
9f88a60d: am
481f15c1: set youtube player lang based on user pref and enable captions when not English
* commit '
2881d6f31b9daf9a3d701671eae3297040d84799':
set youtube player lang based on user pref and enable captions when not English
smain@google.com [Tue, 16 Dec 2014 03:40:27 +0000 (03:40 +0000)]
am
2c3ae43f: am
29e06142: am
d24088c0: add analytics event to track from which page a video was started
* commit '
2c3ae43f9e8329d7f0c24192fe1fd400d1a870b2':
add analytics event to track from which page a video was started
smain@google.com [Tue, 16 Dec 2014 03:39:31 +0000 (03:39 +0000)]
am
3ff2fd14: am
d7dbaf5c: am
ed677d7a: update analytics event for searches to make query case-insensitive and save the URL instead of doc title.
* commit '
3ff2fd14b1276e3b9c0473bd987c1bb34925ef86':
update analytics event for searches to make query case-insensitive and save the URL instead of doc title.
Michael Runge [Mon, 15 Dec 2014 22:50:58 +0000 (22:50 +0000)]
am
2b800123: am
34a1bdeb: am
ea1dc699: Merge "Rewrite ro.vendor.build.fingerprint/thumbprint on signing" into lmp-mr1-dev
* commit '
2b800123c405f444906c9ff69c62d9db4de0103c':
Rewrite ro.vendor.build.fingerprint/thumbprint on signing
Michael Runge [Mon, 15 Dec 2014 22:46:33 +0000 (22:46 +0000)]
am
34a1bdeb: am
ea1dc699: Merge "Rewrite ro.vendor.build.fingerprint/thumbprint on signing" into lmp-mr1-dev
* commit '
34a1bdeb333ab15ddc3840ac3e5d1e8c3245d44a':
Rewrite ro.vendor.build.fingerprint/thumbprint on signing
Michael Runge [Mon, 15 Dec 2014 22:36:01 +0000 (22:36 +0000)]
am
ea1dc699: Merge "Rewrite ro.vendor.build.fingerprint/thumbprint on signing" into lmp-mr1-dev
* commit '
ea1dc6996803e05399ac612a8dd030330b308b59':
Rewrite ro.vendor.build.fingerprint/thumbprint on signing
Elliott Hughes [Mon, 15 Dec 2014 22:04:06 +0000 (22:04 +0000)]
am
97d1d8de: am
91e724d4: Merge "Remove HAVE_SCHED_H."
* commit '
97d1d8de8420802f12d828059baf4cdd274065b5':
Remove HAVE_SCHED_H.
Michael Runge [Mon, 15 Dec 2014 21:35:18 +0000 (21:35 +0000)]
Merge "Rewrite ro.vendor.build.fingerprint/thumbprint on signing" into lmp-mr1-dev
Elliott Hughes [Mon, 15 Dec 2014 19:27:19 +0000 (19:27 +0000)]
am
91e724d4: Merge "Remove HAVE_SCHED_H."
* commit '
91e724d42f921dd35943cdc89e8f4c4362da691a':
Remove HAVE_SCHED_H.
Elliott Hughes [Mon, 15 Dec 2014 18:46:56 +0000 (18:46 +0000)]
am
695a0804: am
55e21af2: Merge "Remove unused OS_SHARED_LIB_FORMAT_STR."
* commit '
695a080462718465cc410dc59a65c013ad7599c6':
Remove unused OS_SHARED_LIB_FORMAT_STR.
smain@google.com [Mon, 15 Dec 2014 18:00:18 +0000 (18:00 +0000)]
am
b05558cf: am
3de83c1b: make shadowbox video always centered to fit the window height
* commit '
b05558cf01a42214efd0d8c6484c62a7b0212947':
make shadowbox video always centered to fit the window height
smain@google.com [Mon, 15 Dec 2014 17:54:02 +0000 (17:54 +0000)]
am
3de83c1b: make shadowbox video always centered to fit the window height
* commit '
3de83c1bcdf1229b51db7dbf9331611c596a478c':
make shadowbox video always centered to fit the window height
smain@google.com [Sat, 13 Dec 2014 03:06:52 +0000 (19:06 -0800)]
make shadowbox video always centered to fit the window height
Change-Id: I03f8ffac555dbbbbd5538fedf13413aca031fd74
Elliott Hughes [Mon, 15 Dec 2014 17:18:18 +0000 (17:18 +0000)]
Merge "Remove HAVE_SCHED_H."
Elliott Hughes [Mon, 15 Dec 2014 00:55:11 +0000 (16:55 -0800)]
Remove HAVE_SCHED_H.
Change-Id: I1308b90c4b33d0ab1a01de44bebba03687217f2b
Elliott Hughes [Sat, 13 Dec 2014 18:59:39 +0000 (18:59 +0000)]
am
55e21af2: Merge "Remove unused OS_SHARED_LIB_FORMAT_STR."
* commit '
55e21af2079b7f44b7aa70d8ba08075e8a79ff38':
Remove unused OS_SHARED_LIB_FORMAT_STR.
Elliott Hughes [Sat, 13 Dec 2014 18:51:23 +0000 (18:51 +0000)]
Merge "Remove unused OS_SHARED_LIB_FORMAT_STR."
Joe Fernandez [Sat, 13 Dec 2014 00:55:39 +0000 (00:55 +0000)]
am
91f2ba64: am
a4417712: Merge "docs: SHA update in sdkpage.cs" into lmp-docs
* commit '
91f2ba648f4187cea415ddc826ef155afe7e8122':
docs: SHA update in sdkpage.cs
Joe Fernandez [Sat, 13 Dec 2014 00:48:20 +0000 (00:48 +0000)]
am
a4417712: Merge "docs: SHA update in sdkpage.cs" into lmp-docs
* commit '
a4417712657f15cd8b36132bd642b54443cee1f0':
docs: SHA update in sdkpage.cs
Joe Fernandez [Sat, 13 Dec 2014 00:43:10 +0000 (00:43 +0000)]
Merge "docs: SHA update in sdkpage.cs" into lmp-docs
smain@google.com [Sat, 13 Dec 2014 00:30:28 +0000 (00:30 +0000)]
am
9f88a60d: am
481f15c1: set youtube player lang based on user pref and enable captions when not English
* commit '
9f88a60d5cb57552f88c26d7531ee235415dd381':
set youtube player lang based on user pref and enable captions when not English
smain@google.com [Sat, 13 Dec 2014 00:21:31 +0000 (00:21 +0000)]
am
481f15c1: set youtube player lang based on user pref and enable captions when not English
* commit '
481f15c172f06048f2934dac88e04e140d61041f':
set youtube player lang based on user pref and enable captions when not English
Rich Slogar [Fri, 12 Dec 2014 22:25:45 +0000 (14:25 -0800)]
docs: SHA update in sdkpage.cs
Change-Id: I2c94b1af228295a3650d17e2c00023e5b52ec1b9
Elliott Hughes [Fri, 12 Dec 2014 23:54:56 +0000 (15:54 -0800)]
Remove unused OS_SHARED_LIB_FORMAT_STR.
Change-Id: Ibaaf112c5a6bfe2084fe34e32e31bcd755e718a8
Dianne Hackborn [Fri, 12 Dec 2014 20:20:53 +0000 (20:20 +0000)]
am
9f6353e0: (-s ours) am
c5fd92a3: am
423854bf: am
934b04d3: (-s ours) am
27fad66a: Merge "DO NOT MERGE. Bump version to 5.0.2." into lmp-dev
* commit '
9f6353e014aa54014e57e881bb4281537cf09e1f':
DO NOT MERGE. Bump version to 5.0.2.
smain@google.com [Fri, 12 Dec 2014 19:57:27 +0000 (11:57 -0800)]
set youtube player lang based on user pref and enable captions when not English
Change-Id: I3208074713d3f7b571a22a7ef8f18a9131827e98
smain@google.com [Fri, 12 Dec 2014 19:53:32 +0000 (19:53 +0000)]
am
29e06142: am
d24088c0: add analytics event to track from which page a video was started
* commit '
29e06142fdb2b6225d38f0ce141d28156bbdfea3':
add analytics event to track from which page a video was started
smain@google.com [Fri, 12 Dec 2014 19:46:26 +0000 (19:46 +0000)]
am
d24088c0: add analytics event to track from which page a video was started
* commit '
d24088c08de24b6cb5efeecec406e5e9180c0b8b':
add analytics event to track from which page a video was started
smain@google.com [Fri, 12 Dec 2014 19:31:13 +0000 (11:31 -0800)]
add analytics event to track from which page a video was started
Change-Id: I9ba1f992c09fb9e18c55bca5bf3892e50f37012a
smain@google.com [Fri, 12 Dec 2014 18:42:58 +0000 (18:42 +0000)]
am
d7dbaf5c: am
ed677d7a: update analytics event for searches to make query case-insensitive and save the URL instead of doc title.
* commit '
d7dbaf5c14cf1e6669df0d21f552a9b21cb63fb7':
update analytics event for searches to make query case-insensitive and save the URL instead of doc title.
smain@google.com [Fri, 12 Dec 2014 18:29:36 +0000 (18:29 +0000)]
am
ed677d7a: update analytics event for searches to make query case-insensitive and save the URL instead of doc title.
* commit '
ed677d7a0e3491824584391d7255d113696bad85':
update analytics event for searches to make query case-insensitive and save the URL instead of doc title.
smain@google.com [Fri, 12 Dec 2014 18:19:17 +0000 (10:19 -0800)]
update analytics event for searches to make query case-insensitive
and save the URL instead of doc title.
Change-Id: Iad8c5f4873173f6964fc4ebffee8aef878891a8e
Dianne Hackborn [Fri, 12 Dec 2014 14:42:11 +0000 (14:42 +0000)]
am
c5fd92a3: am
423854bf: am
934b04d3: (-s ours) am
27fad66a: Merge "DO NOT MERGE. Bump version to 5.0.2." into lmp-dev
* commit '
c5fd92a3ea7bbb93701e9c322434dabaa6b8e787':
DO NOT MERGE. Bump version to 5.0.2.
Dianne Hackborn [Fri, 12 Dec 2014 00:26:01 +0000 (00:26 +0000)]
am
423854bf: am
934b04d3: (-s ours) am
27fad66a: Merge "DO NOT MERGE. Bump version to 5.0.2." into lmp-dev
* commit '
423854bfb99eb274e0e8adb3a3c344ae15905ae6':
DO NOT MERGE. Bump version to 5.0.2.
Dianne Hackborn [Fri, 12 Dec 2014 00:19:51 +0000 (00:19 +0000)]
am
934b04d3: (-s ours) am
27fad66a: Merge "DO NOT MERGE. Bump version to 5.0.2." into lmp-dev
* commit '
934b04d3767974934d3d2e90e6196955f5b83d0c':
DO NOT MERGE. Bump version to 5.0.2.
Dianne Hackborn [Thu, 11 Dec 2014 22:29:46 +0000 (22:29 +0000)]
am
27fad66a: Merge "DO NOT MERGE. Bump version to 5.0.2." into lmp-dev
* commit '
27fad66a8c730e58b3f2aab56edc8c6078b4283e':
DO NOT MERGE. Bump version to 5.0.2.
Dianne Hackborn [Thu, 11 Dec 2014 22:25:31 +0000 (22:25 +0000)]
Merge "DO NOT MERGE. Bump version to 5.0.2." into lmp-dev
Dianne Hackborn [Thu, 11 Dec 2014 22:04:55 +0000 (14:04 -0800)]
DO NOT MERGE. Bump version to 5.0.2.
Change-Id: Ia6426dd03ac3b51061429b7da36e317bd3503775
Yohann Roussel [Thu, 11 Dec 2014 12:28:14 +0000 (12:28 +0000)]
Merge "Adapt to Jack and Jill Brest release"
Ying Wang [Thu, 11 Dec 2014 01:39:26 +0000 (01:39 +0000)]
am
b283ef2c: am
18eee18e: am
60686586: Add product variable PRODUCT_AAPT_PREBUILT_DPI
* commit '
b283ef2c3bf76a268e216ba66d0d9cf97d7b97ea':
Add product variable PRODUCT_AAPT_PREBUILT_DPI
Ying Wang [Thu, 11 Dec 2014 00:07:38 +0000 (00:07 +0000)]
am
18eee18e: am
60686586: Add product variable PRODUCT_AAPT_PREBUILT_DPI
* commit '
18eee18e6e51da4857054376ad96add16c0c0b92':
Add product variable PRODUCT_AAPT_PREBUILT_DPI
Ying Wang [Wed, 10 Dec 2014 22:46:47 +0000 (22:46 +0000)]
am
904e88b5: am
8750cfc5: am
111ba923: Bump generic_arm64 system partition size to 900M.
* commit '
904e88b5bed7a0be84057382d2c433e95d8096b7':
Bump generic_arm64 system partition size to 900M.
Ying Wang [Wed, 10 Dec 2014 22:36:49 +0000 (22:36 +0000)]
am
8750cfc5: am
111ba923: Bump generic_arm64 system partition size to 900M.
* commit '
8750cfc5b5af821c90b224e727729e721c981e78':
Bump generic_arm64 system partition size to 900M.
Ying Wang [Wed, 10 Dec 2014 22:19:49 +0000 (22:19 +0000)]
am
60686586: Add product variable PRODUCT_AAPT_PREBUILT_DPI
* commit '
60686586a5f9c8f78b9ad16e19782da85e89a760':
Add product variable PRODUCT_AAPT_PREBUILT_DPI
Ying Wang [Wed, 10 Dec 2014 20:40:09 +0000 (12:40 -0800)]
Add product variable PRODUCT_AAPT_PREBUILT_DPI
We use search LOCAL_DPI_VARIANTS in the list of
"$(PRODUCT_AAPT_PREF_CONFIG) $(PRODUCT_AAPT_PREBUILT_DPI)"
and the first takes precedence.
That way if we don't have a best match, we fall back to the second best,
the way how it worked with PRODUCT_AAPT_CONFIG previously.
Bug:
18388705
Change-Id: I8bd646c52215c65cc6e38c728857af9b64d13469
Ying Wang [Wed, 10 Dec 2014 18:52:51 +0000 (18:52 +0000)]
am
111ba923: Bump generic_arm64 system partition size to 900M.
* commit '
111ba923bec7e99d3ee49688f7ad426b760f8b36':
Bump generic_arm64 system partition size to 900M.
Ying Wang [Wed, 10 Dec 2014 17:56:06 +0000 (09:56 -0800)]
Bump generic_arm64 system partition size to 900M.
This fixes the arm64 sdk build.
Change-Id: Ic7b7ada79027845974cbcfc68941cfc87ed050fd
smain@google.com [Wed, 10 Dec 2014 17:43:46 +0000 (17:43 +0000)]
am
18b3eb1d: am
425aa9f9: am
79ad9c78: am
8aebbf0d: am
0ecb5a68: add links to release notes
* commit '
18b3eb1de57f015aef294f776a926518027c5eda':
add links to release notes
David Friedman [Wed, 10 Dec 2014 17:43:45 +0000 (17:43 +0000)]
am
46c4bcdc: am
13c3e7eb: am
03e066b7: am
83e96ca8: am
1a0159f2: Merge "CSS change changing default from "Using Eclipse" to "Using Android Studio" Bug
16679117" into lmp-docs
* commit '
46c4bcdcb8811cb50a7317b4bcba585e66d1f1f3':
CSS change changing default from "Using Eclipse" to "Using Android Studio" Bug
16679117
Yohann Roussel [Wed, 19 Nov 2014 13:01:06 +0000 (14:01 +0100)]
Adapt to Jack and Jill Brest release
Includes cherry-picks of:
2e78d2f4263bc7c0f90d58af7014017f16aa3ce6 Jack option --import-res was renamed --import-resource
fdc913ee86fe0c45581178b901a673fdd7937e03 Update references to Jack type collison policy
8d83d1b21ec678fb9fb1c6ee643ace46d5f700ce Rename jill tmp file
8a1c98ce4ba0b4db39f274d6258b6a08bbc3ec2c Ensure that jar-arg-list is never shared
8d83d1b21ec678fb9fb1c6ee643ace46d5f700ce Remove manipulations of jack libraries
Change-Id: I3ee159d408ba5281ac15c9836dc4fd2bdeb845d3
Qiwen Zhao [Tue, 9 Dec 2014 23:46:39 +0000 (23:46 +0000)]
am
c3851b18: Merge "Merge commit \'
aaf823d2\' into lmp-mr1-dev-plus-aosp" into lmp-mr1-dev-plus-aosp
* commit '
c3851b18bbe4baabb1ce9f615a8733c3fc5515b3':
Dan Albert [Tue, 9 Dec 2014 23:44:32 +0000 (23:44 +0000)]
am
023fd1fc: am
e98755f9: Merge "Add a SANITIZE_HOST flag."
* commit '
023fd1fca8b200d73d0b2628180a602750ae59ee':
Add a SANITIZE_HOST flag.
Dan Albert [Tue, 9 Dec 2014 23:44:31 +0000 (23:44 +0000)]
am
ee582aac: am
cd814343: Merge "Let clang decide ASan linker flags for the host."
* commit '
ee582aac416040240bb8959a966173f435178855':
Let clang decide ASan linker flags for the host.
smain@google.com [Tue, 9 Dec 2014 23:15:06 +0000 (23:15 +0000)]
am
425aa9f9: am
79ad9c78: am
8aebbf0d: am
0ecb5a68: add links to release notes
* commit '
425aa9f99ba73cea3d469727d5eb446eeb43d0c9':
add links to release notes
David Friedman [Tue, 9 Dec 2014 23:15:05 +0000 (23:15 +0000)]
am
13c3e7eb: am
03e066b7: am
83e96ca8: am
1a0159f2: Merge "CSS change changing default from "Using Eclipse" to "Using Android Studio" Bug
16679117" into lmp-docs
* commit '
13c3e7eb90ea8b2bed230dd91e79b0e3403c59fb':
CSS change changing default from "Using Eclipse" to "Using Android Studio" Bug
16679117
smain@google.com [Tue, 9 Dec 2014 23:03:29 +0000 (23:03 +0000)]
am
5d48286c: am
30aea34e: am
07c19f68: am
87b1b5ed: am
102db8b5: update sdk template with new studio downloads
* commit '
5d48286c01a407c56d6fc13d666d7ead70e0d2a1':
update sdk template with new studio downloads
smain@google.com [Tue, 9 Dec 2014 23:03:28 +0000 (23:03 +0000)]
am
f0a2e5eb: am
a324f898: am
3984cca2: am
79ac4384: am
d53f0660: update to sdk page template for Android Studio downloads
* commit '
f0a2e5eb86512ae792af7fb3a93667531635c5f9':
update to sdk page template for Android Studio downloads
Rich Slogar [Tue, 9 Dec 2014 23:03:27 +0000 (23:03 +0000)]
am
0e41ac78: (-s ours) am
2305c8d9: am
8242ce83: am
db8d79a9: am
fe4dd526: docs: sdkpage update [CP]
* commit '
0e41ac78037c581da6315be7f27f28b589975356':
docs: sdkpage update [CP]
Tim Murray [Tue, 9 Dec 2014 22:28:57 +0000 (14:28 -0800)]
disable Krait for Mac builds to avoid assembler issues
Change-Id: Ie98f4dbc2cef92798ec08b43b93e7e0339a92a92
smain@google.com [Tue, 9 Dec 2014 22:20:22 +0000 (22:20 +0000)]
am
79ad9c78: am
8aebbf0d: am
0ecb5a68: add links to release notes
* commit '
79ad9c786a33f9f433fd943f87a2c8b1975e89a5':
add links to release notes
David Friedman [Tue, 9 Dec 2014 22:20:21 +0000 (22:20 +0000)]
am
03e066b7: am
83e96ca8: am
1a0159f2: Merge "CSS change changing default from "Using Eclipse" to "Using Android Studio" Bug
16679117" into lmp-docs
* commit '
03e066b75936c5f93d79b2912972ee6b6d760c1a':
CSS change changing default from "Using Eclipse" to "Using Android Studio" Bug
16679117
Michael Runge [Tue, 9 Dec 2014 21:54:23 +0000 (13:54 -0800)]
Rewrite ro.vendor.build.fingerprint/thumbprint on signing
This should also indicate release-keys.
Bug:
18281807
Change-Id: I8d2568ca346625b91384f7e639d9c92e97587755
smain@google.com [Tue, 9 Dec 2014 21:33:27 +0000 (21:33 +0000)]
am
8aebbf0d: am
0ecb5a68: add links to release notes
* commit '
8aebbf0dbaf37b558307a9d794dfbb041ce55614':
add links to release notes
OSDN Git Service
