Commit Graph

15904 Commits

Author SHA1 Message Date
Ying Wang 2530c787db am 4b539d15: Merge "More consistent host library path in multilib build."
* commit '4b539d1533a5d8647e5f54b0a41b2a49d7f4c785':
  More consistent host library path in multilib build.
2014-07-01 00:22:30 +00:00
Elliott Hughes 491871aa03 am 4b7ba417: Merge "Add -Wl,--fatal-warnings to x86_64."
* commit '4b7ba41704a8f028ffdf9f2c8bff57d9d4055f93':
  Add -Wl,--fatal-warnings to x86_64.
2014-06-30 22:53:49 +00:00
Ying Wang 4b539d1533 Merge "More consistent host library path in multilib build." 2014-06-30 22:29:38 +00:00
Ying Wang 36ef50f2a2 More consistent host library path in multilib build.
In 64-bit multilib host build, changed from
32-bit lib: out/host/<platform>/lib32
64-bit lib: out/host/<platform>/lib
to
32-bit lib: out/host/<platform>/lib
64-bit lib: out/host/<platform>/lib64
.
That way the host library path is consistent with the multilib target
build's. Also with this change prebuilt 32-bit libraries can be reused
in 64-bit host build as 2nd arch binaries. (With previous setup, they
can't be used because they have rpath ../lib in it while the 2nd arch
library path needs ../lib32.

Change-Id: I020199d0c7dd52cdc8dcb7d3a1d22cd6178672e1
2014-06-30 17:06:21 -07:00
Ying Wang ccbf593046 am 51254e6c: Merge "Fix missing rs_compatibility_jni_libs."
* commit '51254e6c6065c0c771886472853e6dbc5377c6ae':
  Fix missing rs_compatibility_jni_libs.
2014-06-30 18:25:37 +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
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 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
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
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
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
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
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
Ying Wang 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
Ying Wang 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
Ying Wang eb12847b33 Merge "Switch another reference from core to core-libart" 2014-06-23 21:56:07 +00:00
Brian Carlstrom 074151bdf3 Switch another reference from core to core-libart
Bug: 14298175
Change-Id: I37dc7d5bc63d967db4b3cb8aee695a40b12a8c8d
2014-06-23 15:34:17 -07:00
Michael Wright b0c6ea9f29 Merge "Invoke debuggerd64 when appropriate with stacks." 2014-06-23 21:50:22 +00:00
Michael Wright 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
Ying Wang b00bb2d865 Merge "Resolve :32 to 32-bit variant only if the variant exists." 2014-06-23 21:50:22 +00:00
Ying Wang 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
Elliott Hughes fbc6f25712 am c04b4455: Merge "Updated gdbclient path support."
* commit 'c04b4455689280fad51d48a5587fd93aa8980d01':
  Updated gdbclient path support.
2014-06-23 19:44:23 +00:00
Ying Wang cd66e5ca0a am 6a8b3b43: Merge " delete duplicate variable definition"
* commit '6a8b3b43bbc99f23439ae32c0ec1180d5586b773':
  delete duplicate variable definition
2014-06-23 16:54:01 +00:00
Elliott Hughes c04b445568 Merge "Updated gdbclient path support." 2014-06-20 21:00:34 +00:00
Brigid Smith 7a569a6282 Updated gdbclient path support.
Now gdbclient accepts a fully qualified pathname for EXEs, which it will
not modify, or a relative pathname, to which it will prefix
"/system/bin".  As an example, each of the following now works.

Fully qualified:
adb shell gdbserver :5039 /system/bin/ping
bg
gdbclient /system/bin/ping :5039 /system/bin/ping

Relative:
adb shell gdbserver :5039 /system/bin/ping
bg
gdbclient ping :5039 /system/bin/ping

Change-Id: I1e4c9fca64c4fbc52c255271cc7f83f35c258509
2014-06-20 14:12:42 -07:00
Ying Wang 6a8b3b43bb Merge " delete duplicate variable definition" 2014-06-20 21:00:34 +00:00
Brian Carlstrom 696f9d3e9c am e0be9135: Merge "Bump BOARD_SYSTEMIMAGE_PARTITION_SIZE for generic_x86_64"
* commit 'e0be9135a249ee5d60c6b897e7d538b1afb94b29':
  Bump BOARD_SYSTEMIMAGE_PARTITION_SIZE for generic_x86_64
2014-06-20 20:58:52 +00:00
Bill Yi 9c6235777e am 85fe1439: (-s ours) Merge "Restore AOSP-style version numbers - DO NOT MERGE"
* commit '85fe14395b8bbc5b44383c1705f60bfdc12c61cf':
  Restore AOSP-style version numbers - DO NOT MERGE
2014-06-20 18:29:59 +00:00
Brian Carlstrom e0be9135a2 Merge "Bump BOARD_SYSTEMIMAGE_PARTITION_SIZE for generic_x86_64" 2014-06-20 02:09:57 +00:00
Brian Carlstrom 6bf07cc4de Bump BOARD_SYSTEMIMAGE_PARTITION_SIZE for generic_x86_64
Change-Id: Ia856159017f6228dbfd5a7100e3731b82e6e8fe4
2014-06-20 13:09:25 -07:00
Bill Yi 85fe14395b Merge "Restore AOSP-style version numbers - DO NOT MERGE" 2014-06-20 02:09:57 +00:00
Ying Wang 318c8e76ee am 17c6426e: Merge "Document the worker_threads option."
* commit '17c6426e75ef46238f5866f9a9295db4a95f21b5':
  Document the worker_threads option.
2014-06-19 17:11:59 +00:00
Neil Fuller 40f3300577 am fa63e306: Merge "Fix the CTS build now that core is gone"
* commit 'fa63e30605ff723cfef493540553dabdf0440339':
  Fix the CTS build now that core is gone
2014-06-19 10:34:02 +00:00
Bill Yi b76d4093d3 Restore AOSP-style version numbers - DO NOT MERGE 2014-06-19 00:22:38 -07:00
Brian Carlstrom 32d25fdabf am dab766a7: Merge "Switch from core to core-libart"
* commit 'dab766a7312b1313c89930b5307f33f0baec1549':
  Switch from core to core-libart
2014-06-19 02:14:26 +00:00
Brian Carlstrom dab766a731 Merge "Switch from core to core-libart" 2014-06-18 22:48:04 +00:00
Brian Carlstrom b1dafb1804 Switch from core to core-libart
Bug: 14298175
Change-Id: I1db40e7c67322d80a108b2b88e6d2e6d275d7898
2014-06-18 17:42:32 -07:00
Ying Wang cc2e90e653 am 0f1ca830: Merge "Rewrite the clean steps for TARGET_2ND_ARCH."
* commit '0f1ca830ce14277f2fe71c066b4e83ee53727f77':
  Rewrite the clean steps for TARGET_2ND_ARCH.
2014-06-18 22:42:18 +00:00