The Android Automerger
59fafc7c9b
merge in ics-mr1-release history after reset to ics-mr1
2012-01-13 16:16:51 -08:00
Jean-Baptiste Queru
783ab23697
am da3631db
: (-s ours) am fdbb9f94
: am 96a228bd
: Merge "Remove mention of layoutopt/uix as they are gone."
...
* commit 'da3631dbd120219b883973bb22b64ebd3ef33078':
Remove mention of layoutopt/uix as they are gone.
2012-01-13 11:20:34 -08:00
Jean-Baptiste Queru
da3631dbd1
am fdbb9f94
: am 96a228bd
: Merge "Remove mention of layoutopt/uix as they are gone."
...
* commit 'fdbb9f94bc4b22f60fb46d0babb52c2a0d047aef':
Remove mention of layoutopt/uix as they are gone.
2012-01-12 17:20:28 -08:00
Jean-Baptiste Queru
fdbb9f94bc
am 96a228bd
: Merge "Remove mention of layoutopt/uix as they are gone."
...
* commit '96a228bd7904b83274575522a267d178b3da2341':
Remove mention of layoutopt/uix as they are gone.
2012-01-12 17:18:48 -08:00
Ying Wang
df2b4b3aab
Compute TARGET_TOOLCHAIN_ROOT from TARGET_TOOLS_PREFIX.
...
Sometimes TARGET_TOOLS_PREFIX is passed in as command line makefile
variable or environmental variable without TARGET_TOOLCHAIN_ROOT.
This change computes TARGET_TOOLCHAIN_ROOT from TARGET_TOOLS_PREFIX in
that case.
Change-Id: I0a37dc1f4d1e3e1951faeffd5e9f926f0a6614dd
2012-01-12 16:38:17 -08:00
Jean-Baptiste Queru
96a228bd79
Merge "Remove mention of layoutopt/uix as they are gone."
2012-01-12 14:07:20 -08:00
The Android Automerger
604b5429ba
IMM12
2012-01-12 14:04:09 -08:00
The Android Automerger
913d46388f
merge in ics-mr1-release history after reset to ics-mr1
2012-01-12 14:00:23 -08:00
Glenn Kasten
51bd3fa0b2
Merge "Fix build warning"
2012-01-12 10:14:23 -08:00
The Android Open Source Project
78aacee8e3
am 6019f7b0
: Reconcile with ics-mr1-release
...
* commit '6019f7b0954cdf2e9063087c94f825778a6feda0':
IMM11
2012-01-12 08:58:04 -08:00
The Android Open Source Project
6019f7b095
Reconcile with ics-mr1-release
...
Change-Id: I8aa81509837cca423f8ac241d97e45d822086acf
2012-01-12 08:56:04 -08:00
Glenn Kasten
1022e27642
Fix build warning
...
Change-Id: I1e3a76e4bdae5eec4f75c5d8eb9f533afab6d140
2012-01-12 07:30:27 -08:00
Xavier Ducrohet
4b5e4ba5fd
Remove mention of layoutopt/uix as they are gone.
2012-01-11 18:07:31 -08:00
The Android Automerger
6add6c759a
IMM11
2012-01-11 16:31:51 -08:00
The Android Automerger
5153c456df
merge in ics-mr1-release history after reset to ics-mr1
2012-01-11 16:27:43 -08:00
Brian Muramatsu
777e86a025
Merge "Avoid Rebuilding Core and VMTest Descriptions"
2012-01-11 11:32:17 -08:00
Jean-Baptiste Queru
3b1dbe9302
Merge "Revert "Reference new location of SDK toolchain""
2012-01-11 09:04:25 -08:00
Jean-Baptiste Queru
d75dbec617
Revert "Reference new location of SDK toolchain"
...
This reverts commit 1b834c6660
.
2012-01-11 09:00:41 -08:00
Conley Owens
b5370bc4cb
Merge "Add a module_path_check for vendor files"
2012-01-11 08:36:23 -08:00
Jean-Baptiste Queru
b6737c1366
Merge "Reference new location of SDK toolchain"
2012-01-11 06:36:55 -08:00
Jean-Baptiste Queru
cb8f66305c
Revert "Point arm toolchain to the new gcc-4.6 one."
...
This reverts commit 1f87795eef
.
2012-01-11 04:23:06 -08:00
Scott Main
dfd93fc209
am 5c267863
: am f962eb10
: Merge "docs: add css for Android Design links and add link to site header" into ics-mr1
...
* commit '5c26786314c934819d460fb565be200ee8894ed0':
docs: add css for Android Design links and add link to site header
2012-01-10 17:18:50 -08:00
Scott Main
5c26786314
am f962eb10
: Merge "docs: add css for Android Design links and add link to site header" into ics-mr1
...
* commit 'f962eb101b21814556f4edeb7128508d47cf5564':
docs: add css for Android Design links and add link to site header
2012-01-10 17:16:53 -08:00
Scott Main
f962eb101b
Merge "docs: add css for Android Design links and add link to site header" into ics-mr1
2012-01-10 17:14:34 -08:00
Vladimir Chtchetkine
d0ad72f38f
am 02169251
: (-s ours) am 2cbcd24b
: Cherry-picked from e6b969f3b
in master. Do not merge.
...
* commit '021692515734748c2632ce7a59fceed40a5eb9b6':
Cherry-picked from e6b969f3b
in master. Do not merge.
2012-01-10 16:44:44 -08:00
Vladimir Chtchetkine
0216925157
am 2cbcd24b
: Cherry-picked from e6b969f3b
in master. Do not merge.
...
* commit '2cbcd24ba708be5e387b8bf54351f5c2df7abbec':
Cherry-picked from e6b969f3b
in master. Do not merge.
2012-01-10 16:42:47 -08:00
Vladimir Chtchetkine
2cbcd24ba7
Cherry-picked from e6b969f3b
in master. Do not merge.
...
Add boot property enabling ADBD over QEMU
Emulator and system image now support ADBD communication over QEMUD pipe rather
than over a TCP port forwarding. However, emulator has to know ahead of time
(before system starts booting) whether or not the system image supports ADBD
over pipe to properly setup the communication. For that, we introduce a boot
property "ro.adb.qemu" that is readable by the emulator early enough for the
proper ADB communication setup.
Change-Id: I978489c5acf46177b520e775d745bcc78f469837
2012-01-10 16:31:08 -08:00
Conley Owens
8e0f7129fa
Add a module_path_check for vendor files
...
When this is enabled we ensure that files from the vendor directory
get installed to /system/vendor/* instead of elsewhere in /system/*.
This changes the PRODUCT_RESTRICT_VENDOR_FILES variable
to accept "owner", "path", "owner path", or "all".
"true" will still only enforce vendor file owner restrictions.
Change-Id: I4598130a590ad56976e011f4cb2a9f5f227d5732
2012-01-10 15:45:40 -08:00
Scott Main
b10b282b43
docs: add css for Android Design links and add link to site header
...
Change-Id: I0a9469519076b1c5b9d7c121df1f2c731a08d2cb
2012-01-10 09:59:22 -08:00
Jean-Baptiste Queru
1b834c6660
Reference new location of SDK toolchain
...
Change-Id: If470d742a92061006d94b72f21df5c642348e179
2012-01-09 15:07:59 -08:00
Jean-Baptiste Queru
ea91f0a40e
Reference x86 toolchain in its new location
...
Change-Id: I990b03107d1596a87a8d4cea6973735c60db4c64
2012-01-09 13:02:03 -08:00
Ying Wang
71b5cc1b8e
Reference the new prebuilt ccache location.
...
Change-Id: I4450a8254fe82ed3a670ce653f49381d9c075c8e
2012-01-09 11:52:23 -08:00
Steve Block
ca1df5a380
Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE
...
See https://android-git.corp.google.com/g/#/c/157220
Bug: 5449033
Change-Id: Ieea4e4511e1a95caeea42cd0a0c1147ebf9c2f48
2012-01-08 11:03:18 +00:00
Jing Yu
0c13efb418
Merge "Point arm toolchain to the new gcc-4.6 one."
2012-01-06 20:29:15 -08:00
The Android Open Source Project
fad6b161f4
am 2921f03d
: Reconcile with ics-mr1-release
...
* commit '2921f03d716f2aeb52712a81faaf7dfb597d0826':
IMM06
2012-01-06 18:16:25 -08:00
The Android Open Source Project
2921f03d71
Reconcile with ics-mr1-release
...
Change-Id: I6903bc47ab690fd56612f4e0e6289bf7a9799dca
2012-01-06 18:14:56 -08:00
Jean-Baptiste Queru
8f8624e61f
am 9caacbd7
: am 5ea72eff
: Use the new location of the emulator kernel
...
* commit '9caacbd74328624dfc753cecfc42cb29bf14bfad':
Use the new location of the emulator kernel
2012-01-06 17:41:07 -08:00
Jean-Baptiste Queru
9caacbd743
am 5ea72eff
: Use the new location of the emulator kernel
...
* commit '5ea72effbd944891708d2d6fb61055830e617701':
Use the new location of the emulator kernel
2012-01-06 17:37:02 -08:00
Jean-Baptiste Queru
5ea72effbd
Use the new location of the emulator kernel
2012-01-06 17:02:24 -08:00
The Android Automerger
110ddac4a5
IMM06
2012-01-06 16:34:51 -08:00
The Android Automerger
adfb341695
merge in ics-mr1-release history after reset to ics-mr1
2012-01-06 16:31:06 -08:00
Jean-Baptiste Queru
7353e43b85
am da1c81ab
: am a230c4d0
: Reference kernel notice in the new location
...
* commit 'da1c81abe48c76f59953fd2e14a2ae2283d7bf92':
Reference kernel notice in the new location
2012-01-06 15:22:50 -08:00
Jean-Baptiste Queru
da1c81abe4
am a230c4d0
: Reference kernel notice in the new location
...
* commit 'a230c4d049258915f6614e7a3fadc2dcfec3e160':
Reference kernel notice in the new location
2012-01-06 15:18:21 -08:00
Jean-Baptiste Queru
a230c4d049
Reference kernel notice in the new location
2012-01-06 15:05:53 -08:00
Jing Yu
1f87795eef
Point arm toolchain to the new gcc-4.6 one.
...
Tested build mysid-eng, sojus-eng, trygon-eng, yakju-eng.
Change-Id: I742cf9fcf2407b9098c99136d67161ecf062ac01
Conflicts:
core/combo/TARGET_linux-arm.mk
2012-01-06 14:14:06 -08:00
Ying Wang
c7a10ddd31
Include toolchain makefile based on the current config.
...
So we can have the same set of module names in different host arch
/ toolchain version combinations.
Change-Id: Iec66584bf3de92aedd71a59f9dbe74b6ed025b2e
2012-01-06 11:59:30 -08:00
Brian Muramatsu
c0a6924101
Avoid Rebuilding Core and VMTest Descriptions
...
Only generate the core test and vmtest descriptions when something has
actually changed rather than everytime CTS is built. This should make
iterative test development in CTS more pleasant.
The rule targets are changed to be the paths of the test description
XML files in a separate directory outside of the CTS distribution.
The buildCts.py rule copies these XMLs when they change to the
final CTS distribution location and creates the final plan file.
The dependencies have also been changed to reply upon the full
package paths rather than their phony targets to avoid rebuilding
everything all the time.
Finally, the AppSecurity rule was removed, because I have taken
care of that in my prior change to the Makefiles in the CTS
project.
Change-Id: I88b92c7a4cb4c2c2e20f06641e7ba0604d37f805
2012-01-05 18:44:16 -08:00
Steve Block
c0b74df335
Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGE
...
See https://android-git.corp.google.com/g/157065
Bug: 5449033
Change-Id: I817c12b1e97bee598097d02c70d509f7ab70576a
2012-01-05 23:28:01 +00:00
Steve Block
e8646c237f
Merge "Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGE"
2012-01-05 14:08:39 -08:00
Jeff Davidson
3203891750
Add hm/hmm/hmmm command.
...
Everyone always mixes up m/mm/mmm and may not know about the "help"
command; this seems to be a nice way to remind yourself. :)
Change-Id: I009c7f7891768a8605c06e8d16384a812e607438
2012-01-05 13:19:21 -08:00