Guang Zhu
d214c7e495
am 5d76a3f2: Merge "add uiautomator into system image" into jb-dev
...
* commit '5d76a3f2d53fceb883d84d214c28c51bc3e5b43c':
add uiautomator into system image
2012-06-18 11:55:49 -07:00
Guang Zhu
5d76a3f2d5
Merge "add uiautomator into system image" into jb-dev
2012-06-18 11:52:42 -07:00
Ying Wang
0caa16b0d9
am 51125621: am 43ca4a45: Remove the user tag and legacy prebuilts for the srec modules.
...
* commit '51125621080c64b106abaeb414676cf51c0fd9c3':
Remove the user tag and legacy prebuilts for the srec modules.
2012-06-18 10:52:19 -07:00
Ying Wang
5112562108
am 43ca4a45: Remove the user tag and legacy prebuilts for the srec modules.
...
* commit '43ca4a45a43e2084b5a40af90ff523b0417d31c0':
Remove the user tag and legacy prebuilts for the srec modules.
2012-06-18 10:33:33 -07:00
The Android Automerger
7be7b424b8
JRN79
2012-06-18 07:06:59 -07:00
The Android Automerger
34721324a1
merge in jb-release history after reset to jb-dev
2012-06-18 06:59:23 -07:00
Torne (Richard Coles)
596549c4d3
Merge "Make building an empty static library work."
2012-06-18 01:51:46 -07:00
The Android Automerger
5b0b2a4ec0
JRN78B
2012-06-17 17:06:48 -07:00
The Android Automerger
87888c7395
JRN78
2012-06-17 07:08:19 -07:00
The Android Automerger
eebf803bf6
merge in jb-release history after reset to jb-dev
2012-06-17 06:59:26 -07:00
Guang Zhu
e770754b9f
add uiautomator into system image
...
this includes 2 pieces:
* uiautomator shell script
* uiautomator.jar: test runner and the automation framework
classes
source is under frameworks/testing/uiautomator
Change-Id: I237d85b8917d2451cf35362d2e34786940897921
2012-06-17 00:33:08 -07:00
The Android Automerger
583216a7dc
JRN77
2012-06-16 07:11:00 -07:00
The Android Automerger
1577b15dca
merge in jb-release history after reset to jb-dev
2012-06-16 06:59:32 -07:00
Ying Wang
43ca4a45a4
Remove the user tag and legacy prebuilts for the srec modules.
...
Change-Id: I20d8ec8986e2da76fbab67d1f86f5d385bd87c47
2012-06-15 18:36:06 -07:00
Ying Wang
e4ff0b0042
Merge "Convert LOCAL_LOCAL_JNI_SHARED_LIBRARIES to LOCAL_REQUIRED_MODULES in a full build"
2012-06-15 17:36:50 -07:00
The Android Automerger
175026a969
JRN75E
2012-06-15 16:17:07 -07:00
The Android Automerger
fe79d01cad
JRN75D
2012-06-15 14:13:01 -07:00
Torne (Richard Coles)
bffaef246a
Make building an empty static library work.
...
Handle the case where a static library is not built because it has no
input files (e.g. because they are conditionally included and it happens
that the computed list is empty). Previously, ar never ran because of
split-long-arguments, and anything that depended on the static library
would fail to link. Make sure that ar runs at least once.
Change-Id: If0071d7ae50c4e45fff1772dca43187af155db1f
2012-06-15 16:06:21 +01:00
Kito Cheng
70dc3e1d3d
Profiling use aprof, enable by LOCAL_ENABLE_APROF or LOCAL_ENABLE_APROF_JNI
...
Change-Id: Ia95dc7318e17c0804867b22e239edccc5cbec0af
2012-06-15 15:16:50 +08:00
The Android Automerger
ccfa22ebad
JRN75C
2012-06-14 16:48:04 -07:00
Ying Wang
81f0fd6cdb
Convert LOCAL_LOCAL_JNI_SHARED_LIBRARIES to LOCAL_REQUIRED_MODULES in a full build
...
To save space.
Change-Id: I7c88c13e4225bed89106917de57cbae74fc79ab8
2012-06-14 15:29:20 -07:00
The Android Automerger
43843b6f58
JRN75B
2012-06-14 13:29:21 -07:00
Jean-Baptiste Queru
a9e85effdd
am ffbef646: am 74aba614: Allow additional vendors
...
* commit 'ffbef646d2bec4f84874bdc5940c3b060904cb3d':
Allow additional vendors
2012-06-14 10:34:46 -07:00
Jean-Baptiste Queru
d2750d06c3
am 55e8c113: am 3e4732a3: am 08779651: Merge "generic_x86: build using the NDK ABI\'s processor features"
...
* commit '55e8c113afc9d52d2142de72a4eebfc2c5a9ef05':
generic_x86: build using the NDK ABI's processor features
2012-06-14 10:33:20 -07:00
Jean-Baptiste Queru
ffbef646d2
am 74aba614: Allow additional vendors
...
* commit '74aba61404f0c1ea8693d2959d81d8b5b1bdf5d4':
Allow additional vendors
2012-06-14 09:24:18 -07:00
Jean-Baptiste Queru
74aba61404
Allow additional vendors
...
Bug: 6611375
Change-Id: I07a1c4e56a2c9fdb1f2c8426977f1a8db0e4d4bb
2012-06-14 09:15:20 -07:00
The Android Automerger
91f3d748c4
JRN75
2012-06-14 07:09:54 -07:00
The Android Automerger
11b1194cf6
merge in jb-release history after reset to jb-dev
2012-06-14 06:59:24 -07:00
The Android Automerger
291b58d00d
JRN74C
2012-06-13 18:43:04 -07:00
Jean-Baptiste Queru
55e8c113af
am 3e4732a3: am 08779651: Merge "generic_x86: build using the NDK ABI\'s processor features"
...
* commit '3e4732a39f63326d267a1af17184556e3977f582':
generic_x86: build using the NDK ABI's processor features
2012-06-13 17:34:28 -07:00
Jean-Baptiste Queru
3e4732a39f
am 08779651: Merge "generic_x86: build using the NDK ABI\'s processor features"
...
* commit '0877965170498b2dd3a58f9483cf26d6945c9138':
generic_x86: build using the NDK ABI's processor features
2012-06-13 17:31:45 -07:00
Jean-Baptiste Queru
0877965170
Merge "generic_x86: build using the NDK ABI's processor features"
2012-06-13 17:17:34 -07:00
The Android Automerger
0445111a01
JRN74B
2012-06-13 16:40:23 -07:00
Ying Wang
022a7b32ef
Fix arm mode for the generated protobuf code.
...
Change-Id: Ic644ab9e1b83d9616dd9ca93362805cdd17f36a7
2012-06-13 11:38:10 -07:00
The Android Automerger
d3acbf293f
JRN74
2012-06-13 09:03:15 -07:00
The Android Automerger
e0db94ba82
merge in jb-release history after reset to jb-dev
2012-06-13 08:26:26 -07:00
Jean-Baptiste Queru
41a3fb3707
am 6e207824: resolved conflicts for merge of 572d0d7d
to jb-dev-plus-aosp
...
* commit '6e207824af267eea8777949ccf6d0584accd55a0':
x86: Clean up atom vs/ non-atom compiler flags, enable SSSE3
2012-06-13 07:44:31 -07:00
Jean-Baptiste Queru
6e207824af
resolved conflicts for merge of 572d0d7d
to jb-dev-plus-aosp
...
Change-Id: I6c750adcf06457bf8a3b47423c990be6e9d23bbb
2012-06-13 07:42:04 -07:00
Jean-Baptiste Queru
572d0d7dd3
am 3f8ff030: Merge "x86: Clean up atom vs/ non-atom compiler flags, enable SSSE3"
...
* commit '3f8ff030e0c693ca0b1758612ecb571711ec2667':
x86: Clean up atom vs/ non-atom compiler flags, enable SSSE3
2012-06-13 07:22:29 -07:00
Jean-Baptiste Queru
3f8ff030e0
Merge "x86: Clean up atom vs/ non-atom compiler flags, enable SSSE3"
2012-06-13 06:25:00 -07:00
Jean-Baptiste Queru
2f65e81974
am 06b1a47f: am d3d78a30: am a11ad6c2: Merge "gcc 4.6 requires --copy-dt-needed-entries"
...
* commit '06b1a47fe19699e8cb94fd6a007f82f3b41119fe':
gcc 4.6 requires --copy-dt-needed-entries
2012-06-12 15:56:29 -07:00
Ying Wang
8e53708ab1
Don't add COMPILER_RT_CONFIG_EXTRA_STATIC_LIBRARIES if we build against NDK.
...
Change-Id: I732be02bb4b9ee7a2d11ed89f409487f0bc37d0f
2012-06-12 15:52:58 -07:00
Jean-Baptiste Queru
06b1a47fe1
am d3d78a30: am a11ad6c2: Merge "gcc 4.6 requires --copy-dt-needed-entries"
...
* commit 'd3d78a30a4f8dd40fa055577ea2708ab34606cec':
gcc 4.6 requires --copy-dt-needed-entries
2012-06-12 15:52:54 -07:00
Jean-Baptiste Queru
d3d78a30a4
am a11ad6c2: Merge "gcc 4.6 requires --copy-dt-needed-entries"
...
* commit 'a11ad6c2b3cdf13581c4329679cd3d2952323f6d':
gcc 4.6 requires --copy-dt-needed-entries
2012-06-12 15:50:19 -07:00
Stephen Hines
2897f052d4
Merge "EXPERIMENTAL: Add libcompiler-rt-extras.a to device builds."
2012-06-12 15:38:21 -07:00
Jean-Baptiste Queru
a11ad6c2b3
Merge "gcc 4.6 requires --copy-dt-needed-entries"
2012-06-12 15:24:17 -07:00
Jean-Baptiste Queru
0951ce6aa2
am 12d24b5a: resolved conflicts for merge of 76af0657
to jb-dev-plus-aosp
...
* commit '12d24b5aaba0752239401fc2c8b579e3b8ae97dd':
full_x86: use telephony profile
2012-06-12 15:16:28 -07:00
Jean-Baptiste Queru
12d24b5aab
resolved conflicts for merge of 76af0657
to jb-dev-plus-aosp
...
Change-Id: I4843695261abbc478fd6b505debe6fc20a06c88d
2012-06-12 14:57:27 -07:00
Jean-Baptiste Queru
76af0657be
am 0c6b27fe: Merge "full_x86: use telephony profile"
...
* commit '0c6b27fe83a810c5a91c3aa1a4ffc0348d24b5cd':
full_x86: use telephony profile
2012-06-12 14:43:56 -07:00
Jean-Baptiste Queru
0c6b27fe83
Merge "full_x86: use telephony profile"
2012-06-12 14:36:04 -07:00