Commit graph

19107 commits

Author SHA1 Message Date
Ying Wang
3e164be71d am 556efe00: am 9e05c9e4: am dc58c2a6: Merge "Remove nonexistent from /buildbot/automergers/mirror-aosp-master-to-stage-aosp-master/.repo/repo:/buildbot/automergers/mirror-aosp-master-to-stage-aosp-master/.repo/repo:/buildbot/automergers/mirror-aosp-master-to-stage-a
* commit '556efe002f852dfa5ca5331e92b1d65a32339f26':
  Remove nonexistent $ANDROID_QTOOLS from $PATH.
2014-06-30 17:39:28 +00:00
Ying Wang
556efe002f am 9e05c9e4: am dc58c2a6: Merge "Remove nonexistent from /buildbot/automergers/mirror-aosp-master-to-stage-aosp-master/.repo/repo:/buildbot/automergers/mirror-aosp-master-to-stage-aosp-master/.repo/repo:/buildbot/automergers/mirror-aosp-master-to-stage-aosp-master/.r
* commit '9e05c9e4e642673dc6d9104c44d26810773c382d':
  Remove nonexistent $ANDROID_QTOOLS from $PATH.
2014-06-30 17:36:39 +00:00
Ying Wang
9e05c9e4e6 am dc58c2a6: Merge "Remove nonexistent from /buildbot/automergers/mirror-aosp-master-to-stage-aosp-master/.repo/repo:/buildbot/automergers/mirror-aosp-master-to-stage-aosp-master/.repo/repo:/buildbot/automergers/mirror-aosp-master-to-stage-aosp-master/.repo/repo:/usr/lib/google-golang/bin:/usr/local/buildtools/java/jdk/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/buildbot/automergers:/buildbot/automergers."
* commit 'dc58c2a6c216577110682521fa787fd9640cc89d':
  Remove nonexistent $ANDROID_QTOOLS from $PATH.
2014-06-30 17:32:05 +00:00
Brian Carlstrom
191e5988d0 resolved conflicts for merge of da92aef7 to master
Change-Id: I70b608d48b0e7cfea3d970101769c156a211f861
2014-06-28 13:54:24 -07:00
Ian Rogers
da92aef762 am 8625b6e7: am 7634e413: Merge "Host support for prefer symlink"
* commit '8625b6e74ae33db8ce7d18c131ba3d87f121d1f3':
  Host support for prefer symlink
2014-06-28 00:36:10 +00:00
Ian Rogers
8625b6e74a am 7634e413: Merge "Host support for prefer symlink"
* commit '7634e4136fee6c7a02f4a343072400ba575c0051':
  Host support for prefer symlink
2014-06-28 00:30:43 +00:00
Ying Wang
51254e6c60 Merge "Fix missing rs_compatibility_jni_libs." 2014-06-27 16:59:53 +00:00
Ying Wang
efe7779cfb Fix missing rs_compatibility_jni_libs.
Bug: 15935150
Change-Id: I2971bcf4a9fa96e7a5098a759ecc67ba4f565b6c
2014-06-30 11:20:41 -07:00
Ying Wang
dc58c2a6c2 Merge "Remove nonexistent $ANDROID_QTOOLS from $PATH." 2014-06-27 16:59:53 +00:00
Ying Wang
2a859d5a62 Remove nonexistent $ANDROID_QTOOLS from $PATH.
Bug: 15983070
Change-Id: Id3807a6dabd616ae06aafc2b894c1858e4400e26
2014-06-30 10:25:33 -07:00
Ian Rogers
7634e4136f Merge "Host support for prefer symlink" 2014-06-27 16:59:53 +00:00
Ian Rogers
cf331d931d Host support for prefer symlink
We need a host symlink for dalvik, our *-dalvik-host build targets
are failing.

Change-Id: I6045de20c948b456a150033deb3459895aff83c6
2014-06-27 17:23:03 -07: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
Ying Wang
8d43e17bfd Merge "Support to check System API." 2014-06-27 15:56:14 +00:00
Ed Heyl
c6d11f8c66 no color output, thanks Mac; better callback to real make
Change-Id: Iff2a15ed8aad28c264209b26a33d1206ec80b794
2014-06-27 14:19:51 -07:00
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
Ying Wang
829f68bb02 Support to check System API.
Change-Id: I60f8c9bb13efb6a440bb735d634f63fab035c810
2014-06-26 17:54:28 -07: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
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
Elliott Hughes
4b7ba41704 Merge "Add -Wl,--fatal-warnings to x86_64." 2014-06-26 18:33:52 +00:00
Elliott Hughes
3beb51692e Add -Wl,--fatal-warnings to x86_64.
Bug: 11358761
Change-Id: I0c86a2ce3f95e89cc6c6eed65f3595922a90f45f
2014-06-30 14:52:30 -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