JP Abgrall
1207d5e02b
Merge "releasetools: only allow yaffs to have no userdata image size (fix build)"
2014-06-27 15:56:14 +00:00
JP Abgrall
4d09dcb2c6
releasetools: only allow yaffs to have no userdata image size (fix build)
...
In the past, there was an exception for ext-base fs types to
deal with the lack of image size.
Back then it was only yaffs and ext*.
So now we explicitely only allow yaffs to have no userdata image size.
Change-Id: Ie354ee6222a58228dbcce2c6934971a0737422af
Signed-off-by: JP Abgrall <jpa@google.com>
2014-06-26 21:15:39 -07:00
Colin Cross
e2543ea2ea
Merge "build: fix vendor symbols in gdb"
2014-06-26 18:42:03 +00:00
Colin Cross
d00c0a2e20
HACK: report CPU abi as 2nd arch if present
...
Workaround to report armv7 abis for arm64 devices until the play store
looks at the new android.os.Build.SUPPORTED_ABIS list.
Bug: 15018047
Change-Id: If5f4081073ee80433aae51ef15ccbfa1c6ae624c
2014-06-27 10:49:26 -07:00
Colin Cross
a58f8e04c9
build: fix vendor symbols in gdb
...
Set TARGET_OUT_VENDOR_SHARED_LIBRARIES_UNSTRIPPED
Append '64' for 64-bit libraries
Change-Id: Ief289bb23950d4bed84cf616cff6038fbd8caf95
2014-06-27 10:48:22 -07:00
Ying Wang
a26a2123b8
am 7a6a9a55: am 4bdbd6d4: am e1b43254: Merge "Add --pseudo-localize aapt parameter for builds."
...
* commit '7a6a9a558271ac959a2e441fe27aae3df77d4421':
Add --pseudo-localize aapt parameter for builds.
2014-06-27 16:24:46 +00:00
Ying Wang
7a6a9a5582
am 4bdbd6d4: am e1b43254: Merge "Add --pseudo-localize aapt parameter for builds."
...
* commit '4bdbd6d4346a246df8edaf9323e15d84a1f35951':
Add --pseudo-localize aapt parameter for builds.
2014-06-27 16:19:26 +00:00
Ying Wang
4bdbd6d434
am e1b43254: Merge "Add --pseudo-localize aapt parameter for builds."
...
* commit 'e1b43254b72613e6bf9ac994c1b3f07e0020ed9c':
Add --pseudo-localize aapt parameter for builds.
2014-06-27 16:14:30 +00:00
Dirk Dougherty
80b97e1c19
am 23673843: Doc change: add query param to force refresh in proxy caches.
...
* commit '236738439acab7c9b2afc2725b44c4867597ed7f':
Doc change: add query param to force refresh in proxy caches.
2014-06-26 21:09:09 +00:00
Dirk Dougherty
236738439a
Doc change: add query param to force refresh in proxy caches.
...
Change-Id: I7bbec536bba7878ef9b5fdc91a25a47437e276ed
2014-06-26 13:07:57 -07:00
Ying Wang
e1b43254b7
Merge "Add --pseudo-localize aapt parameter for builds."
2014-06-26 18:33:52 +00:00
Igor Viarheichyk
c4dfe6ef30
Add --pseudo-localize aapt parameter for builds.
...
Some packages can override list of locales with
LOCAL_AAPT_INCLUDE_ALL_RESOURCES parameter, disabling
pseudolocalization. Adding new --pseudo-localize flag to
aapt if pseudo-locales are specified in product locales
list solves this issue.
Change-Id: Iae705d4fe99453650339fd1ca65d1005671b3e4f
2014-06-26 17:27:36 -07:00
Baligh Uddin
0a74bf180a
Merge "Add new locales for Platform (L) release"
2014-06-26 18:07:29 +00:00
Baligh Uddin
c8ae20330c
Add new locales for Platform (L) release
...
Bug: 13437459
Change-Id: Ic186d288469b503118513a437de3a2ef446e34fc
2014-06-26 22:40:06 +00:00
Ying Wang
5bc22c9637
Merge "Set up oem.img directory structure for TARGET_2ND_ARCH."
2014-06-26 17:57:04 +00:00
Dirk Dougherty
43da4342d2
am 80b97e1c: am 23673843: Doc change: add query param to force refresh in proxy caches.
...
* commit '80b97e1c193687d74a93e9f9b365ba11838817df':
Doc change: add query param to force refresh in proxy caches.
2014-06-26 21:14:40 +00:00
Ying Wang
f15250ed86
Set up oem.img directory structure for TARGET_2ND_ARCH.
...
Change-Id: Ia931a10708225c428b658cb4a30e8bba66fa7308
2014-06-26 14:12:35 -07:00
Nick Vaccaro
56eb2f983e
Add logd to core_tiny.mk (for logcat functionality)
...
Bug: 15143878
Change-Id: Ief73aac31b0d4689d38c734dc23f0d20cdcdea17
2014-06-26 19:35:40 +00:00
Robert Ly
3cbf635856
am 13c416be: am 28d695a0: css changes for index page card
...
* commit '13c416be55329150bbfefe2a51ae05c8c832db84':
css changes for index page card
2014-06-26 10:31:01 +00:00
Robert Ly
4e8b404300
am 8a782585: am a34ef028: Merge "docs: Updating download dir for ADT 23.0.0 links to new location" into klp-modular-dev
...
* commit '8a78258526e49957d285c48ddba5a8de64774256':
docs: Updating download dir for ADT 23.0.0 links to new location
2014-06-26 10:31:00 +00:00
Robert Ly
13c416be55
am 28d695a0: css changes for index page card
...
* commit '28d695a0051af88d72cd025cdd3df01ae5fffed1':
css changes for index page card
2014-06-26 09:50:21 +00:00
Robert Ly
8a78258526
am a34ef028: Merge "docs: Updating download dir for ADT 23.0.0 links to new location" into klp-modular-dev
...
* commit 'a34ef028a00192877209281490a468c29cdacd40':
docs: Updating download dir for ADT 23.0.0 links to new location
2014-06-26 09:49:40 +00:00
Robert Ly
28d695a005
css changes for index page card
...
Change-Id: I4fca8284acf50ad05bf9c06ada0daa636b3e9e6f
2014-06-25 22:50:49 -07:00
Ying Wang
0e2b634408
am 01b179bf: am bb964f00: am 432cd6dd: Merge "Allow LOCAL_RESOURCE_DIR pointing to dir generated during the build"
...
* commit '01b179bf3b5c4c0307e0efb4004a1c44705fe780':
Allow LOCAL_RESOURCE_DIR pointing to dir generated during the build
2014-06-25 23:21:30 +00:00
smain@google.com
bd7b23e403
am 0858c65a: am 5771ee3c: add style for stand-alone back link with left arrow
...
* commit '0858c65a4d2e9cda9b9a6017bc1f4bf32125cafc':
add style for stand-alone back link with left arrow
2014-06-25 23:21:00 +00:00
Ying Wang
01b179bf3b
am bb964f00: am 432cd6dd: Merge "Allow LOCAL_RESOURCE_DIR pointing to dir generated during the build"
...
* commit 'bb964f00403a23d2f1ec3313f7b579a9e7f0f12a':
Allow LOCAL_RESOURCE_DIR pointing to dir generated during the build
2014-06-25 23:03:02 +00:00
Ying Wang
bb964f0040
am 432cd6dd: Merge "Allow LOCAL_RESOURCE_DIR pointing to dir generated during the build"
...
* commit '432cd6dd78afe9c23cd0ddf669e4f0f973a17a7c':
Allow LOCAL_RESOURCE_DIR pointing to dir generated during the build
2014-06-25 22:58:11 +00:00
smain@google.com
0858c65a4d
am 5771ee3c: add style for stand-alone back link with left arrow
...
* commit '5771ee3c41afc7024ca8c76c7b8deef3798d0bcd':
add style for stand-alone back link with left arrow
2014-06-25 22:23:02 +00:00
smain@google.com
5771ee3c41
add style for stand-alone back link with left arrow
...
Change-Id: Ia9219e3e77ef23c6bf6374244c57c4c7e8d1f386
2014-06-25 15:12:52 -07:00
smain@google.com
4bc8177434
am e022e9a7: am bb9ecf42: undo the butterbar change, because automerger is ruthless
...
* commit 'e022e9a7139a55ed8d9fcc9dca3ffdf37727b164':
undo the butterbar change, because automerger is ruthless
2014-06-25 20:45:52 +00:00
smain@google.com
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
Ying Wang
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
Ying Wang
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
Ying Wang
432cd6dd78
Merge "Allow LOCAL_RESOURCE_DIR pointing to dir generated during the build"
2014-06-25 17:35:00 +00:00
Ying Wang
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
Ying Wang
e69d4350cd
Merge "Support to add JNI of both archs in multilib build."
2014-06-25 17:34:34 +00:00
Clay Murphy
0e9f646d39
Merge "Docs: Replacing s.a.c. Android logo to match other sites."
2014-06-25 17:34:07 +00:00
Ying Wang
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
Ying Wang
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
Dmitry Shmidt
3ee67afe40
Merge "build: core: Add nxpsw for AEC function"
2014-06-25 03:38:12 +00:00
smain@google.com
bb9ecf420f
undo the butterbar change, because automerger is ruthless
...
Change-Id: If9953c9c7af1250a26a74691d8aac58808595c85
2014-06-24 18:43:36 -07:00
Michael Wright
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
Michael Wright
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
Michael Wright
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
smain@google.com
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
smain@google.com
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
smain@google.com
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
smain@google.com
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
smain@google.com
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
smain@google.com
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