Commit Graph

16549 Commits

Author SHA1 Message Date
Ying Wang 240e136efd am 318c8e76: am 17c6426e: Merge "Document the worker_threads option."
* commit '318c8e76ee8f47fb9f077e419713cf4dbb454788':
  Document the worker_threads option.
2014-06-19 17:16:39 +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 cc317c40d3 am 40f33005: am fa63e306: Merge "Fix the CTS build now that core is gone"
* commit '40f3300577d4b55926728744f1d25c08aa4e4a8b':
  Fix the CTS build now that core is gone
2014-06-19 10:39:23 +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
Brian Carlstrom 8fd9944e8f am 32d25fda: am dab766a7: Merge "Switch from core to core-libart"
* commit '32d25fdabfaadc95292b43a29b695d8229333bcf':
  Switch from core to core-libart
2014-06-19 02:17:54 +00: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
Ying Wang 451dbd7c00 am cc2e90e6: am 0f1ca830: Merge "Rewrite the clean steps for TARGET_2ND_ARCH."
* commit 'cc2e90e653c55724f20410347d709b70b1eaf105':
  Rewrite the clean steps for TARGET_2ND_ARCH.
2014-06-18 22:58:30 +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 0d073451e7 am 9a954de3: am 8fb55d06: Merge "Remove some uses of the deprecated WITH_HOST_DALVIK."
* commit '9a954de366bad8ba2cce2cb6c917a1bec7c61c77':
  Remove some uses of the deprecated WITH_HOST_DALVIK.
2014-06-18 20:51:14 +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 a1ac473676 am b110da5f: am 9d8854e3: Merge "build: delete 64-bit blacklist"
* commit 'b110da5f2bf9cf105dd675648075d13c942d1892':
  build: delete 64-bit blacklist
2014-06-18 20:24:56 +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 88440c536b am 5d88b3d7: am c4262982: Merge "Use the correct MKBOOTIMG."
* commit '5d88b3d7d615995c6b1909992347fe0b5692492e':
  Use the correct MKBOOTIMG.
2014-06-18 18:41:01 +00: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
smain@google.com 873234bd7a am 38404199: Merge "revisions to the next/prev page link layout. make "next" link in footer align left, remove previous link in footer, add doc title to next link in footer, move g+ to the right" into klp-modular-dev
* commit '384041992c734be6ec8d2469d071c3358fd15a77':
  revisions to the next/prev page link layout. make "next" link in footer align left, remove previous link in footer, add doc title to next link in footer, move g+ to the right
2014-06-18 16:34:40 +00:00
Elliott Hughes 1a03ddb805 am 09a4cac1: am 7cc3174d: Merge "Removed /system/bin prefix from gdbclient."
* commit '09a4cac12e3b040fb6d18490ff444b2fdd6cb451':
  Removed /system/bin prefix from gdbclient.
2014-06-18 00:55:33 +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
Deepanshu Gupta 849cf47483 am aaa502bc: am e662adf7: am 2a7f1c59: Merge "Integrate build_font.py [DO NOT MERGE]" into klp-dev
* commit 'aaa502bc9ee796c4121cc275834f083b85b4e71e':
  Integrate build_font.py [DO NOT MERGE]
2014-06-18 00:25:30 +00:00
Deepanshu Gupta aaa502bc9e am e662adf7: am 2a7f1c59: Merge "Integrate build_font.py [DO NOT MERGE]" into klp-dev
* commit 'e662adf748be5d8df6056f4cf5da2c821bc27c59':
  Integrate build_font.py [DO NOT MERGE]
2014-06-18 00:15:39 +00:00
Deepanshu Gupta e662adf748 am 2a7f1c59: Merge "Integrate build_font.py [DO NOT MERGE]" into klp-dev
* commit '2a7f1c59300ee462b63e3065f65f24291ca78043':
  Integrate build_font.py [DO NOT MERGE]
2014-06-18 00:10:39 +00:00
Brian Carlstrom a44f9a35a2 am edbc4595: am d51730a6: Merge "Help catch common 32/64-bit errors."
* commit 'edbc4595b817aef5f620e78dc283d8cc8fccff2a':
  Help catch common 32/64-bit errors.
2014-06-17 23:34:52 +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
Elliott Hughes 7cc3174d9c Merge "Removed /system/bin prefix from gdbclient." 2014-06-17 20:49:57 +00:00
Brigid Smith 0a2712d349 Removed /system/bin prefix from gdbclient.
Now a program run through gdbclient will not automatically have
/system/bin added to its path, so programs not in /system/bin will no
longer need to be prefixed with ../../.

The following now works as an example:
 adb shell gdbserver :5039 /system/xbin/crasher
 bg
 gdbclient /system/xbin/crasher :5039 /system/xbin/crasher

And the following now no longer works:
 adb shell gdbserver :5039 /system/xbin/crasher
 bg
 gdbclient ../../system/xbin/crasher :5039 /system/xbin/crasher

Change-Id: I299b66d03915aeb1dc300e43a81c9a51f0bd7dec
2014-06-17 15:42:54 -07:00
smain@google.com 384041992c Merge "revisions to the next/prev page link layout. make "next" link in footer align left, remove previous link in footer, add doc title to next link in footer, move g+ to the right" into klp-modular-dev 2014-06-17 20:49:29 +00:00
smain@google.com 5bc3a1acb0 revisions to the next/prev page link layout.
make "next" link in footer align left, remove previous link in footer,
add doc title to next link in footer, move g+ to the right

Change-Id: Id7c18a1a1a42344e96d0fa17c35908eb87d62612
2014-06-17 20:02:53 -07:00
Deepanshu Gupta 2a7f1c5930 Merge "Integrate build_font.py [DO NOT MERGE]" into klp-dev 2014-06-17 20:49:29 +00:00
smain@google.com 95f3f0296b am 3b77ab5a: fix xss vulnerabilities bug: 15597152 bug: 15405607
* commit '3b77ab5a01f1c3297bed32d9c7fac68a61bf3d20':
  fix xss vulnerabilities bug: 15597152 bug: 15405607
2014-06-17 19:07:05 +00:00
smain@google.com 3b77ab5a01 fix xss vulnerabilities
bug: 15597152
bug: 15405607

Change-Id: I10582d5cd767b977fc2af0f2cf2642802feeffab
2014-06-17 11:57:27 -07:00
Steve Moyer 7091bbf92a am 97f49221: (-s ours) Merge "DO NOT MERGE: Combine emulator test projects into a single apk" into stage-aosp-master
* commit '97f49221add746c1a385a4086054682e7d3a3353':
  DO NOT MERGE: Combine emulator test projects into a single apk
2014-06-17 17:39:26 +00:00
Nick Kralevich f9172a61d7 am 2eb95ac2: am ad6107c3: Merge "Coalesce generic_x86 and generic sepolicy where possible."
* commit '2eb95ac202429d930545043d742ab443bedbf357':
  Coalesce generic_x86 and generic sepolicy where possible.
2014-06-17 16:56:57 +00:00
Nick Kralevich 2eb95ac202 am ad6107c3: Merge "Coalesce generic_x86 and generic sepolicy where possible."
* commit 'ad6107c3e9901ce520eedcad7770a3a9e4f327d8':
  Coalesce generic_x86 and generic sepolicy where possible.
2014-06-17 16:51:14 +00:00
Nick Kralevich 7be1a5197f am 331f4d58: am cc7aebb8: Merge "Restore generic_x86 sepolicy zygote.te file."
* commit '331f4d5863137e5fd5d59f9a407de2a7227a5c23':
  Restore generic_x86 sepolicy zygote.te file.
2014-06-17 13:50:14 +00:00
Nick Kralevich 331f4d5863 am cc7aebb8: Merge "Restore generic_x86 sepolicy zygote.te file."
* commit 'cc7aebb8d30f01029f43be730c27c794b8f39aa6':
  Restore generic_x86 sepolicy zygote.te file.
2014-06-17 13:44:53 +00:00
Narayan Kamath b60ccd6672 am ae65e2eb: am d73ec26a: Merge "Make default 64-bit primary, 32-bit secondary"
* commit 'ae65e2eb8d5f530d4292a5c70bac113f18900e9d':
  Make default 64-bit primary, 32-bit secondary
2014-06-17 10:05:13 +00:00