Mathias Agopian
e80545f00d
am 9967e9db: Merge "add an entry for the new libgui" into gingerbread
...
Merge commit '9967e9dbb82e982db67fcfc5412055f26b8721b4' into gingerbread-plus-aosp
* commit '9967e9dbb82e982db67fcfc5412055f26b8721b4':
add an entry for the new libgui
2010-07-14 16:36:14 -07:00
Mathias Agopian
9967e9dbb8
Merge "add an entry for the new libgui" into gingerbread
2010-07-14 16:31:43 -07:00
android-build SharedAccount
f1b46f6d04
FRG01B
...
Change-Id: Ifa90c748110a60cc2c6af8ced9249d66bed45f35
2010-07-14 13:43:00 -07:00
Andy McFadden
b628985c9b
Update runhat command to use "am dumpheap".
...
Instead of sending a kill -10 to write a file to /data/misc, we now use
"am dumpheap" to create a file on /sdcard.
Also,
- Removed mention of unused "output-file" argument.
- Quoted args in initial tests so bash doesn't go nuts when you say
"runhat" with no arguments.
Bug 2835170.
Change-Id: I614fdb54a1d6b8824bc9b568c07cc0901c41a3d4
2010-07-14 12:43:11 -07:00
Jean-Baptiste Queru
c3a0e4c42d
am c70574ad: am 07523a19: am a0cb4666: Merge "merge from open-source froyo" into froyo
...
Merge commit 'c70574add569a80872b8b00c0a9627b3e94c04f5'
* commit 'c70574add569a80872b8b00c0a9627b3e94c04f5':
Build Accessibility Tests and APK
2010-07-14 11:34:21 -07:00
Jean-Baptiste Queru
c70574add5
am 07523a19: am a0cb4666: Merge "merge from open-source froyo" into froyo
...
Merge commit '07523a191de568aba9753d4d12d1fe392feea497' into gingerbread-plus-aosp
* commit '07523a191de568aba9753d4d12d1fe392feea497':
Build Accessibility Tests and APK
2010-07-14 11:32:07 -07:00
Jean-Baptiste Queru
07523a191d
am a0cb4666: Merge "merge from open-source froyo" into froyo
...
Merge commit 'a0cb466645ccc88d4f6d1f83018d5a0daf2eec6a' into gingerbread
* commit 'a0cb466645ccc88d4f6d1f83018d5a0daf2eec6a':
Build Accessibility Tests and APK
2010-07-14 11:29:08 -07:00
Jean-Baptiste Queru
a0cb466645
Merge "merge from open-source froyo" into froyo
2010-07-14 11:06:23 -07:00
Joe Onorato
b751053151
Fix event-log-tags so we don't rebuild framework.jar because of an installclean.
...
Produce an event logs tag file for everything we know about, in order
to properly allocate numbers. Then produce a file that's filtered
for what's going to be installed.
Change-Id: Id0778aec0b4d045e8ff91ba2c9c8265e860eaba5
2010-07-14 10:22:54 -07:00
Mathias Agopian
b46f2c747c
add an entry for the new libgui
...
libgui is for high level C++ frameworks, it can depend on the
binder (unlike libui).
Change-Id: I4a1ebc69284919c85dce03e1395578af2fd08aa8
2010-07-13 22:27:47 -07:00
Ying Wang
ad8aec94fa
resolved conflicts for merge of 6c56dd64
to master
...
Change-Id: If806a737c5cc46cd4545788dfa991cdeab488213
2010-07-13 21:08:38 -07:00
Joe Onorato
53b3cadbba
The ICU data is no longer compiled directly into the shared library.
...
Change-Id: I79accedc16d6e62a95c0ec6f08ad2538013cd0b3
2010-07-13 19:05:37 -07:00
Ying Wang
6c56dd64b2
am a9b02f0b: resolved conflicts for merge of a6bed2f7
to gingerbread
...
Merge commit 'a9b02f0bfeba5b3df1d6e74e7a695c5d357f2a13' into gingerbread-plus-aosp
* commit 'a9b02f0bfeba5b3df1d6e74e7a695c5d357f2a13':
Add phony target dist_libraries
2010-07-13 19:02:25 -07:00
Ying Wang
a9b02f0bfe
resolved conflicts for merge of a6bed2f7
to gingerbread
...
Change-Id: Ic9efcc70af22f15a1bb136f70a30db59dc629e03
2010-07-13 18:59:56 -07:00
Ying Wang
a6bed2f723
Merge "Add phony target dist_libraries" into froyo
2010-07-13 18:50:05 -07:00
Ying Wang
95318832be
am 4a1addef: am 90b1d3dc: am b6a1c180: Keep the crt start/end var name of sh consistent with other archs
...
Merge commit '4a1addef83d6458ba41b498648a36046a27a01b8'
* commit '4a1addef83d6458ba41b498648a36046a27a01b8':
Keep the crt start/end var name of sh consistent with other archs
2010-07-13 17:51:15 -07:00
Ying Wang
4a1addef83
am 90b1d3dc: am b6a1c180: Keep the crt start/end var name of sh consistent with other archs
...
Merge commit '90b1d3dcfece8eef53277cbcf0326deda9f16f09' into gingerbread-plus-aosp
* commit '90b1d3dcfece8eef53277cbcf0326deda9f16f09':
Keep the crt start/end var name of sh consistent with other archs
2010-07-13 17:48:40 -07:00
Ying Wang
90b1d3dcfe
am b6a1c180: Keep the crt start/end var name of sh consistent with other archs
...
Merge commit 'b6a1c1802961f40fe4736e80402f849968cd2563' into gingerbread
* commit 'b6a1c1802961f40fe4736e80402f849968cd2563':
Keep the crt start/end var name of sh consistent with other archs
2010-07-13 17:46:29 -07:00
Ying Wang
b6a1c18029
Keep the crt start/end var name of sh consistent with other archs
...
So that the PRIVATE_ vars get values correctly.
Change-Id: I1eea67f02c5bab5018b3b5fd93904e1ee8643bf7
2010-07-13 17:41:14 -07:00
Ying Wang
aabbc07cb8
am 90cf34c7: am f0f60cdd: resolved conflicts for merge of 1a08100f
to gingerbread
...
Merge commit '90cf34c72e204eb1d23f43d1fccbf2076e8ff67b'
* commit '90cf34c72e204eb1d23f43d1fccbf2076e8ff67b':
Support to build native libraries with prebuilt NDK
2010-07-13 17:26:00 -07:00
Ying Wang
90cf34c72e
am f0f60cdd: resolved conflicts for merge of 1a08100f
to gingerbread
...
Merge commit 'f0f60cdd8f4f74b2480774887606afdebec8d891' into gingerbread-plus-aosp
* commit 'f0f60cdd8f4f74b2480774887606afdebec8d891':
Support to build native libraries with prebuilt NDK
2010-07-13 17:24:09 -07:00
Ying Wang
f0f60cdd8f
resolved conflicts for merge of 1a08100f
to gingerbread
...
Change-Id: I9e4183a1d5c0efb13de8655b9eb7c74d50b34cd7
2010-07-13 17:21:33 -07:00
Ying Wang
1a08100fa9
Support to build native libraries with prebuilt NDK
...
Bug: http://b/issue?id=2811253
Change-Id: Iabd4ab8b3d7236dffe89f1939e1142e882944026
2010-07-13 16:29:18 -07:00
The Android Open Source Project
0e4c0267fb
merge from open-source froyo
...
Change-Id: I2759c464efef13754154310d10816a5781243311
2010-07-13 15:24:07 -07:00
The Android Open Source Project
dd0af2517c
am 1778b4b1: merge from open-source master
...
Merge commit '1778b4b11effa15b3b540a5153f68127a9ec6adb'
* commit '1778b4b11effa15b3b540a5153f68127a9ec6adb':
Move buildspec vars to BoardConfig.mk
2010-07-12 15:22:50 -07:00
The Android Open Source Project
f508e251ec
am f47b0a17: merge from open-source master
...
Merge commit 'f47b0a1758a66277d11f362e307f0dd6c183051d'
* commit 'f47b0a1758a66277d11f362e307f0dd6c183051d':
Add generic_x86-eng to the lunch menu
2010-07-12 15:06:02 -07:00
The Android Open Source Project
1778b4b11e
merge from open-source master
...
Change-Id: I333595755ed96c753b3f01ef6715a230eee94e0d
2010-07-12 15:01:01 -07:00
The Android Open Source Project
c1b24549e3
am 87f50000: merge from open-source master
...
Merge commit '87f500004acc7b68745bd939a473dd92e77b5c9c'
* commit '87f500004acc7b68745bd939a473dd92e77b5c9c':
Define __ANDROID__ for x86 to be on par with ARM build requirements
2010-07-12 14:58:50 -07:00
The Android Open Source Project
f47b0a1758
merge from open-source master
...
Change-Id: I9363020bdd32d8ff984a3945a2aab6245cf7a3c4
2010-07-12 14:58:14 -07:00
The Android Open Source Project
87f500004a
merge from open-source master
...
Change-Id: I0221f3903a2fc6a0fb25ae62913fdc2e9d3c3f4f
2010-07-12 14:55:52 -07:00
The Android Open Source Project
f3a98c0b2b
am 93c63d57: merge from open-source master
...
Merge commit '93c63d5740cde483217fbbd2ee3c6b7223b3721f'
* commit '93c63d5740cde483217fbbd2ee3c6b7223b3721f':
Vendorsetup needs to look in additional places.
2010-07-12 14:50:28 -07:00
The Android Open Source Project
93c63d5740
merge from open-source master
...
Change-Id: I412376856ebbcec786181c7a9d3b4af4ef52c7a6
2010-07-12 14:46:37 -07:00
The Android Open Source Project
fee7fe7c74
am c9d11861: merge from open-source master
...
Merge commit 'c9d118615161d8b94d4abedac86e3bdf510b251b'
* commit 'c9d118615161d8b94d4abedac86e3bdf510b251b':
Allow TARGET_ARCH to be set from BoardConfig.mk
2010-07-12 14:46:34 -07:00
The Android Open Source Project
c9d1186151
merge from open-source master
...
Change-Id: Iad583004b67ce1ef0651e81b57c2c95632da9845
2010-07-12 14:43:29 -07:00
Jean-Baptiste Queru
af20a6081a
Merge "Move buildspec vars to BoardConfig.mk"
2010-07-12 13:58:59 -07:00
Bruce Beare
6f9318e035
Add generic_x86-eng to the lunch menu
...
Change-Id: Ie4e0f9054c5bc6ad8845b5b885a00174dd8c9534
Signed-off-by: Bruce Beare <brucex.j.beare@intel.com>
2010-07-12 13:55:18 -07:00
Bruce Beare
fe2ef85d5d
Define __ANDROID__ for x86 to be on par with ARM build requirements
...
Change-Id: I79c8f29af1f20b694f22a39f848216022809a5c6
Signed-off-by: Bruce Beare <brucex.j.beare@intel.com>
2010-07-12 13:47:41 -07:00
Bruce Beare
cce6f923aa
Move buildspec vars to BoardConfig.mk
...
Change-Id: I48ed4b55e91aae51076d9c609b44bf9fa24c3ecd
Signed-off-by: Bruce Beare <brucex.j.beare@intel.com>
2010-07-12 11:32:37 -07:00
Jean-Baptiste Queru
e62f2c263a
Merge "Vendorsetup needs to look in additional places."
2010-07-12 11:18:31 -07:00
Bruce Beare
6f8410b976
Vendorsetup needs to look in additional places.
...
Change-Id: I698856f8e02487322540e804c038bba28cc23532
Signed-off-by: Bruce Beare <brucex.j.beare@intel.com>
2010-07-12 10:31:21 -07:00
Bruce Beare
b73dc6690b
Allow TARGET_ARCH to be set from BoardConfig.mk
...
Change-Id: I66aed78b763d238719822257c1f4f35301247df6
Signed-off-by: Bruce Beare <brucex.j.beare@intel.com>
2010-07-12 09:42:10 -07:00
The Android Open Source Project
f84ad26094
am 07dfca2e: merge from open-source master
...
Merge commit '07dfca2ee94decace95368baca7261a29a41184b'
* commit '07dfca2ee94decace95368baca7261a29a41184b':
Fix build - USE_MINGW seems to be the preferred define
acp: Ensure dst mtime always greater or equal to src mtime
2010-07-09 16:08:10 -07:00
The Android Open Source Project
4be5c394c1
am 0fd96df4: merge from open-source master
...
Merge commit '0fd96df49ccecbf3628c95dabf3b94dfc27323e5'
* commit '0fd96df49ccecbf3628c95dabf3b94dfc27323e5':
Refactor Stripper. Allow a stripper other than SOSLIM to be specified
2010-07-09 16:05:04 -07:00
The Android Open Source Project
07dfca2ee9
merge from open-source master
...
Change-Id: I58175b59d0121deaac90375be1dc720889eaf339
2010-07-09 16:02:46 -07:00
The Android Open Source Project
0fd96df49c
merge from open-source master
...
Change-Id: I40aa6f0f885ea30dd5f9918c323fa240a4830c38
2010-07-09 16:02:03 -07:00
The Android Open Source Project
635c42b4bc
am 4f6d526d: merge from open-source master
...
Merge commit '4f6d526d602b115b6cd4f2cefbce3e091bdbd871'
* commit '4f6d526d602b115b6cd4f2cefbce3e091bdbd871':
Set arm specific variables to be empty for non-arm platforms
2010-07-09 15:05:01 -07:00
The Android Open Source Project
2a582caba1
am 39a6a644: merge from open-source master
...
Merge commit '39a6a64471b28032d2037d9472d58dc0a77ef313'
* commit '39a6a64471b28032d2037d9472d58dc0a77ef313':
Create systemtarball either with bz2 or gz
2010-07-09 15:00:57 -07:00
The Android Open Source Project
4f6d526d60
merge from open-source master
...
Change-Id: I72922bd787ea0fbc199d9362e1cd1d2ed8283b57
2010-07-09 14:59:41 -07:00
The Android Open Source Project
39a6a64471
merge from open-source master
...
Change-Id: Ic005b0772e144fc986fd3bacc67d5840b16efb81
2010-07-09 14:57:26 -07:00
The Android Open Source Project
c608c44c1f
am 703f4958: merge from open-source master
...
Merge commit '703f4958c207c575adfa1526725728b96c575649'
* commit '703f4958c207c575adfa1526725728b96c575649':
update 404'd source.android.com URLs
2010-07-09 14:56:44 -07:00