Commit Graph

15886 Commits

Author SHA1 Message Date
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
Ying Wang 17c6426e75 Merge "Document the worker_threads option." 2014-06-18 21:47:53 +00:00
Brian Carlstrom 9a954de366 am 8fb55d06: Merge "Remove some uses of the deprecated WITH_HOST_DALVIK."
* commit '8fb55d06c7bd153e673c1372b3af75bcb849ed9d':
  Remove some uses of the deprecated WITH_HOST_DALVIK.
2014-06-18 20:46:53 +00:00
Colin Cross b110da5f2b am 9d8854e3: Merge "build: delete 64-bit blacklist"
* commit '9d8854e30c93ae9c635ae37c4825ff2c3bfb0f44':
  build: delete 64-bit blacklist
2014-06-18 20:20:58 +00:00
Ying Wang 0f1ca830ce Merge "Rewrite the clean steps for TARGET_2ND_ARCH." 2014-06-18 19:25:04 +00:00
Ying Wang f6268b8ed9 Rewrite the clean steps for TARGET_2ND_ARCH.
Convert clean rules from TARGET_ARCH to TARGET_2ND_ARCH and vice versa.

Change-Id: I5711b38cd834272d26d78e5cf847e97f27139c5b
2014-06-18 14:17:13 -07:00
Brian Carlstrom 8fb55d06c7 Merge "Remove some uses of the deprecated WITH_HOST_DALVIK." 2014-06-18 19:25:04 +00:00
Ian Rogers a00ba56c63 Remove some uses of the deprecated WITH_HOST_DALVIK.
Bug: 13751317.
Change-Id: I4beb81089b4ad7dac4d87571509389d1dae22bf3
2014-06-18 13:38:44 -07:00
Ying Wang 5d88b3d7d6 am c4262982: Merge "Use the correct MKBOOTIMG."
* commit 'c426298280cea52af693ce76fe8643012ebe54b2':
  Use the correct MKBOOTIMG.
2014-06-18 18:36:56 +00:00
Elliott Hughes 09a4cac12e am 7cc3174d: Merge "Removed /system/bin prefix from gdbclient."
* commit '7cc3174d9ca26c3170e201dd73f8d83bcfe27cf3':
  Removed /system/bin prefix from gdbclient.
2014-06-18 00:50:43 +00:00
Brian Carlstrom edbc4595b8 am d51730a6: Merge "Help catch common 32/64-bit errors."
* commit 'd51730a64fac296f42f28ac84feca02a9ee6ef15':
  Help catch common 32/64-bit errors.
2014-06-17 23:31:00 +00:00
Neil Fuller fa63e30605 Merge "Fix the CTS build now that core is gone" 2014-06-17 22:02:27 +00:00
Neil Fuller c61caf11a0 Fix the CTS build now that core is gone
Change-Id: Id36844d17ed7551095fbca4a01e0aaf5224b7ea8
2014-06-19 11:26:54 +01:00
Colin Cross 9d8854e30c Merge "build: delete 64-bit blacklist" 2014-06-17 21:42:00 +00:00
Colin Cross ae2986e51a build: delete 64-bit blacklist
The last projects in the blacklist have been fixed, delete the code.

Change-Id: I0fe7809bd18e32516374c9cb2a6f71df1d3c62ee
2014-06-17 21:35:44 -07:00
Ying Wang c426298280 Merge "Use the correct MKBOOTIMG." 2014-06-17 21:36:55 +00:00
Ying Wang 42c9804331 Use the correct MKBOOTIMG.
Change-Id: I7450a85770cc8de2ea313570999a7d7076e950d2
2014-06-18 11:31:21 -07:00
Brian Carlstrom d51730a64f Merge "Help catch common 32/64-bit errors." 2014-06-17 20:56:23 +00:00
Brian Carlstrom 338d1e7f33 Help catch common 32/64-bit errors.
(cherry picked from commit cf5ea762e015bc044d251814d9062ef1df4dd49f)

Change-Id: I43eb93d41967c63acb0723083c0178019f1364d0
2014-06-17 15:23:49 -07:00