e022e9a713
am bb9ecf42: undo the butterbar change, because automerger is ruthless
...
* commit 'bb9ecf420f136681a3bd4d5503207733b4dc283b':
undo the butterbar change, because automerger is ruthless
2014-06-25 19:12:42 +00:00
904446ce0b
am 1a3d260f: am e69d4350: Merge "Support to add JNI of both archs in multilib build."
...
* commit '1a3d260f68755b476aa867477fc75d47ef5317bf':
Support to add JNI of both archs in multilib build.
2014-06-25 18:46:34 +00:00
1a3d260f68
am e69d4350: Merge "Support to add JNI of both archs in multilib build."
...
* commit 'e69d4350cd4af04349b703ba169ba516a96913ba':
Support to add JNI of both archs in multilib build.
2014-06-25 18:37:53 +00:00
432cd6dd78
Merge "Allow LOCAL_RESOURCE_DIR pointing to dir generated during the build"
2014-06-25 17:35:00 +00:00
6129192ed6
Allow LOCAL_RESOURCE_DIR pointing to dir generated during the build
...
Bug: 15850610
Change-Id: I46b98adb556d8e6bf166761f8bb240006dbe5b14
2014-06-25 14:25:14 -07:00
e69d4350cd
Merge "Support to add JNI of both archs in multilib build."
2014-06-25 17:34:34 +00:00
0e9f646d39
Merge "Docs: Replacing s.a.c. Android logo to match other sites."
2014-06-25 17:34:07 +00:00
58f8cf7273
am 904446ce: am 1a3d260f: am e69d4350: Merge "Support to add JNI of both archs in multilib build."
...
* commit '904446ce0b3f430ac88ae0c08b9c613721474cd5':
Support to add JNI of both archs in multilib build.
2014-06-25 18:52:02 +00:00
8e20ef6205
Support to add JNI of both archs in multilib build.
...
Use "LOCAL_MULTILIB := both" to install jni libraries of both archs in
multilib build.
The build system will package jni of both archs to the apk, or install
them to the right location on the system image and create symlinks,
extract .so files from prebuilt apk, etc if appropriate.
Bug: 15849902
Change-Id: I7e147b5a47db476584c38250de7b36c75ea40d81
2014-06-25 09:07:01 -07:00
3ee67afe40
Merge "build: core: Add nxpsw for AEC function"
2014-06-25 03:38:12 +00:00
bb9ecf420f
undo the butterbar change, because automerger is ruthless
...
Change-Id: If9953c9c7af1250a26a74691d8aac58808595c85
2014-06-24 18:43:36 -07:00
49753f8fa1
am e75101af: am e49d461a: am b0c6ea9f: Merge "Invoke debuggerd64 when appropriate with stacks."
...
* commit 'e75101afdfc528aed486adbc0170964d1b32a91d':
Invoke debuggerd64 when appropriate with stacks.
2014-06-25 01:42:54 +00:00
e75101afdf
am e49d461a: am b0c6ea9f: Merge "Invoke debuggerd64 when appropriate with stacks."
...
* commit 'e49d461a8f713e61ad39ba20b48d2b5fee7beafe':
Invoke debuggerd64 when appropriate with stacks.
2014-06-25 01:36:16 +00:00
e49d461a8f
am b0c6ea9f: Merge "Invoke debuggerd64 when appropriate with stacks."
...
* commit 'b0c6ea9f290261c12b6cb127b7bcd53f8ecc2d60':
Invoke debuggerd64 when appropriate with stacks.
2014-06-25 01:30:40 +00:00
3a5048628b
am 263d6660: (-s ours) am 04edc344: Merge "DO NOT MERGE remove leanback and recyclerview from javadoc build for d.android.com" into klp-modular-dev
...
* commit '263d6660c803110495c0b70ea04afd33f74d39ca':
DO NOT MERGE remove leanback and recyclerview from javadoc build for d.android.com
2014-06-25 00:48:21 +00:00
263d6660c8
am 04edc344: Merge "DO NOT MERGE remove leanback and recyclerview from javadoc build for d.android.com" into klp-modular-dev
...
* commit '04edc344a1887465692b49e3eb58e03dccedd675':
DO NOT MERGE remove leanback and recyclerview from javadoc build for d.android.com
2014-06-25 00:42:51 +00:00
cffd384452
am 0b65bf6b: (-s ours) am 58b617b9: am cd59b7df: am 5f6019ab: DO NOT MERGE add butterbar notice for the google IO SDK announcements
...
* commit '0b65bf6b1b56efafb383c3902c0d8ba419f2657b':
DO NOT MERGE add butterbar notice for the google IO SDK announcements
2014-06-25 00:34:16 +00:00
0b65bf6b1b
am 58b617b9: am cd59b7df: am 5f6019ab: DO NOT MERGE add butterbar notice for the google IO SDK announcements
...
* commit '58b617b902e5a9aa8c0367c894fefa747ea1b5e6':
DO NOT MERGE add butterbar notice for the google IO SDK announcements
2014-06-25 00:27:58 +00:00
e401cf2c7f
am c26839a9: am cfb92aa9: add a smaller version of the device frame for wear
...
* commit 'c26839a901a1ea395a62bb82407c1316e281c52a':
add a smaller version of the device frame for wear
2014-06-25 00:27:54 +00:00
58b617b902
am cd59b7df: am 5f6019ab: DO NOT MERGE add butterbar notice for the google IO SDK announcements
...
* commit 'cd59b7dfdb392153422f5618e2d6e847dcff790b':
DO NOT MERGE add butterbar notice for the google IO SDK announcements
2014-06-25 00:24:34 +00:00
cd59b7dfdb
am 5f6019ab: DO NOT MERGE add butterbar notice for the google IO SDK announcements
...
* commit '5f6019ab6cdcb3000eaf4b695424361a5038ade9':
DO NOT MERGE add butterbar notice for the google IO SDK announcements
2014-06-25 00:19:46 +00:00
5f6019ab6c
DO NOT MERGE
...
add butterbar notice for the google IO SDK announcements
Change-Id: I25bbb0ee4cab95b0c26cd2bd517e490e44ae1465
2014-06-24 17:11:13 -07:00
c26839a901
am cfb92aa9: add a smaller version of the device frame for wear
...
* commit 'cfb92aa963f2fee3251c393bc6dcff9b194af3e1':
add a smaller version of the device frame for wear
2014-06-24 21:14:30 +00:00
5f98ff80d4
build: core: Add nxpsw for AEC function
...
Change-Id: I27d9bf891e5c67aef843489c2136a586ad921cb2
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2014-06-24 13:11:49 -07:00
1a9e1b43e9
am daaec135: am 5899ad25: am b00bb2d8: Merge "Resolve :32 to 32-bit variant only if the variant exists."
...
* commit 'daaec135b4d141335fc1f4e3edf9eb526c9f6954':
Resolve :32 to 32-bit variant only if the variant exists.
2014-06-24 19:42:46 +00:00
daaec135b4
am 5899ad25: am b00bb2d8: Merge "Resolve :32 to 32-bit variant only if the variant exists."
...
* commit '5899ad254d3b94653b88e5f0f41f54690f22bd24':
Resolve :32 to 32-bit variant only if the variant exists.
2014-06-24 19:35:31 +00:00
cfb92aa963
add a smaller version of the device frame for wear
...
Change-Id: I91ead3f689844c5cf4b6862f38c686263f7d5cbf
2014-06-24 11:58:16 -07:00
6bc672aa96
Docs: Replacing s.a.c. Android logo to match other sites.
...
Bug: 15408415
Change-Id: I9bdb294f3ff0c5aaf766b4ead79ad9614f9dbd89
2014-06-24 11:32:56 -07:00
5899ad254d
am b00bb2d8: Merge "Resolve :32 to 32-bit variant only if the variant exists."
...
* commit 'b00bb2d865c21a446d94422346e1bb0fdbc9ba29':
Resolve :32 to 32-bit variant only if the variant exists.
2014-06-24 18:17:52 +00:00
cf1c266e1f
am 47f94218: am abf34118: more tweaks fixes to the next/prev logic. Fix the way \'articles\' include the links. was broken for design docs, all appeared disabled. also add \'white\' style for links that appear on colored background
...
* commit '47f942184e61f830c8045db16d1ca692677e7f59':
more tweaks fixes to the next/prev logic. Fix the way 'articles' include the links. was broken for design docs, all appeared disabled. also add 'white' style for links that appear on colored background
2014-06-24 14:00:39 +00:00
3f1d3a04f2
am 9db3d88c: am daa9e205: Merge "update the wear device frame style. rename and make frame part of css. also update some logic with next/prev links to make navigation prev possible while in design docs (or others that allow cross-boundary nav) and simply remove the \'
...
* commit '9db3d88c34563f8f92fcefb66bd67da3a9661064':
update the wear device frame style. rename and make frame part of css. also update some logic with next/prev links to make navigation prev possible while in design docs (or others that allow cross-boundary nav) and simply remove the 'next' link in the footer when at the end of a set.
2014-06-24 14:00:38 +00:00
47f942184e
am abf34118: more tweaks fixes to the next/prev logic. Fix the way \'articles\' include the links. was broken for design docs, all appeared disabled. also add \'white\' style for links that appear on colored background
...
* commit 'abf34118c3bf14bd4acfde657b3ef8b1fb913bea':
more tweaks fixes to the next/prev logic. Fix the way 'articles' include the links. was broken for design docs, all appeared disabled. also add 'white' style for links that appear on colored background
2014-06-24 13:55:13 +00:00
9db3d88c34
am daa9e205: Merge "update the wear device frame style. rename and make frame part of css. also update some logic with next/prev links to make navigation prev possible while in design docs (or others that allow cross-boundary nav) and simply remove the \'next\' link in
...
* commit 'daa9e205bb7e0d1b0866f0ce919af7749388120f':
update the wear device frame style. rename and make frame part of css. also update some logic with next/prev links to make navigation prev possible while in design docs (or others that allow cross-boundary nav) and simply remove the 'next' link in the footer when at the end of a set.
2014-06-24 13:55:12 +00:00
111ccebf30
am 995783d4: am 57befc90: am eb12847b: Merge "Switch another reference from core to core-libart"
...
* commit '995783d4fde29634e9c61379db5fedad0a232089':
Switch another reference from core to core-libart
2014-06-24 10:38:49 +00:00
995783d4fd
am 57befc90: am eb12847b: Merge "Switch another reference from core to core-libart"
...
* commit '57befc90e924704a7c03bde9596483d0cf1bf36b':
Switch another reference from core to core-libart
2014-06-24 09:28:31 +00:00
a34ef028a0
Merge "docs: Updating download dir for ADT 23.0.0 links to new location" into klp-modular-dev
2014-06-24 08:05:46 +00:00
94dcf1c7cf
docs: Updating download dir for ADT 23.0.0 links to new location
...
Change-Id: Ief0351a902366d0a6ddc5488cb5b6c900c0350e9
2014-06-25 14:45:14 -07:00
57befc90e9
am eb12847b: Merge "Switch another reference from core to core-libart"
...
* commit 'eb12847b332831e31a3cf7e2f89bd10fd626d7d5':
Switch another reference from core to core-libart
2014-06-24 06:53:20 +00:00
eb12847b33
Merge "Switch another reference from core to core-libart"
2014-06-23 21:56:07 +00:00
074151bdf3
Switch another reference from core to core-libart
...
Bug: 14298175
Change-Id: I37dc7d5bc63d967db4b3cb8aee695a40b12a8c8d
2014-06-23 15:34:17 -07:00
b0c6ea9f29
Merge "Invoke debuggerd64 when appropriate with stacks."
2014-06-23 21:50:22 +00:00
aeed721fcc
Invoke debuggerd64 when appropriate with stacks.
...
Read out the ELF header to see if the executable is 64-bit or 32-bit,
then call the appropriate debuggerd. In bash. Ugh.
Change-Id: I6550fe92e775659cd0370bcb70f40dd59238ad8f
2014-06-24 18:06:11 -07:00
b00bb2d865
Merge "Resolve :32 to 32-bit variant only if the variant exists."
2014-06-23 21:50:22 +00:00
7e73eb3f7c
Resolve :32 to 32-bit variant only if the variant exists.
...
Otherwise we just use the original module name.
With this change :32 in 32-bit product configuration will be installed
as expected.
Change-Id: Ibbbf3e8807a17b47f4259c00000a63336bc02f92
2014-06-24 10:22:17 -07:00
04edc344a1
Merge "DO NOT MERGE remove leanback and recyclerview from javadoc build for d.android.com" into klp-modular-dev
2014-06-23 21:50:10 +00:00
6f97b12c78
DO NOT MERGE
...
remove leanback and recyclerview from javadoc build for d.android.com
Change-Id: I0faa1db29dcadda9bfa96bcf4096e369f0a7a4e0
2014-06-24 17:36:31 -07:00
7df87a04f9
am dde1a37e: am fbc6f257: am c04b4455: Merge "Updated gdbclient path support."
...
* commit 'dde1a37eb61a807af666c2adcfcb7c197465da90':
Updated gdbclient path support.
2014-06-23 19:54:11 +00:00
dde1a37eb6
am fbc6f257: am c04b4455: Merge "Updated gdbclient path support."
...
* commit 'fbc6f25712362b1f9b7b8970a96833ed0be0f12c':
Updated gdbclient path support.
2014-06-23 19:48:57 +00:00
4c5d3daef5
am 6fdf121c: Fix 64 bit emulator booting (again).
...
* commit '6fdf121c192944f13255a8908df802051fec6535':
Fix 64 bit emulator booting (again).
2014-06-23 19:46:09 +00:00
fbc6f25712
am c04b4455: Merge "Updated gdbclient path support."
...
* commit 'c04b4455689280fad51d48a5587fd93aa8980d01':
Updated gdbclient path support.
2014-06-23 19:44:23 +00:00
smain@google.com