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
f0f60cdd8f
resolved conflicts for merge of 1a08100f to gingerbread
...
Change-Id: I9e4183a1d5c0efb13de8655b9eb7c74d50b34cd7
2010-07-13 17:21:33 -07:00
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
0e4c0267fb
merge from open-source froyo
...
Change-Id: I2759c464efef13754154310d10816a5781243311
2010-07-13 15:24:07 -07:00
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
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
1778b4b11e
merge from open-source master
...
Change-Id: I333595755ed96c753b3f01ef6715a230eee94e0d
2010-07-12 15:01:01 -07:00
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
f47b0a1758
merge from open-source master
...
Change-Id: I9363020bdd32d8ff984a3945a2aab6245cf7a3c4
2010-07-12 14:58:14 -07:00
87f500004a
merge from open-source master
...
Change-Id: I0221f3903a2fc6a0fb25ae62913fdc2e9d3c3f4f
2010-07-12 14:55:52 -07:00
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
93c63d5740
merge from open-source master
...
Change-Id: I412376856ebbcec786181c7a9d3b4af4ef52c7a6
2010-07-12 14:46:37 -07:00
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
c9d1186151
merge from open-source master
...
Change-Id: Iad583004b67ce1ef0651e81b57c2c95632da9845
2010-07-12 14:43:29 -07:00
af20a6081a
Merge "Move buildspec vars to BoardConfig.mk"
2010-07-12 13:58:59 -07:00
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
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
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
e62f2c263a
Merge "Vendorsetup needs to look in additional places."
2010-07-12 11:18:31 -07:00
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
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
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
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
07dfca2ee9
merge from open-source master
...
Change-Id: I58175b59d0121deaac90375be1dc720889eaf339
2010-07-09 16:02:46 -07:00
0fd96df49c
merge from open-source master
...
Change-Id: I40aa6f0f885ea30dd5f9918c323fa240a4830c38
2010-07-09 16:02:03 -07:00
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
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
4f6d526d60
merge from open-source master
...
Change-Id: I72922bd787ea0fbc199d9362e1cd1d2ed8283b57
2010-07-09 14:59:41 -07:00
39a6a64471
merge from open-source master
...
Change-Id: Ic005b0772e144fc986fd3bacc67d5840b16efb81
2010-07-09 14:57:26 -07:00
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
703f4958c2
merge from open-source master
...
Change-Id: I9381e982495bddb4ddba12bdc46f8c4becddd6bf
2010-07-09 14:54:44 -07:00
8137a0b659
am d7fcea20: merge from open-source master
...
Merge commit 'd7fcea201db376e285aab74cefae29d2ac2b33df'
* commit 'd7fcea201db376e285aab74cefae29d2ac2b33df':
Create boottarball just like systemtarball
2010-07-09 14:39:00 -07:00
62e010989f
am e9dc6ca1: merge from open-source master
...
Merge commit 'e9dc6ca1c0553a4cd4e4f36e376b0a533059af1f'
* commit 'e9dc6ca1c0553a4cd4e4f36e376b0a533059af1f':
Update to latest (froyo) init.rc
2010-07-09 14:36:59 -07:00
d7fcea201d
merge from open-source master
...
Change-Id: I0a6dc054775374db6b312feccebc46e26266b1fe
2010-07-09 14:36:12 -07:00
e9dc6ca1c0
merge from open-source master
...
Change-Id: I04fcaf990b9d0db7235ef34c3be717437bf96e19
2010-07-09 14:34:52 -07:00
380d76104d
am 47bc4e34: merge from open-source master
...
Merge commit '47bc4e3407326bc58bb171660af5ced4edb93608'
* commit '47bc4e3407326bc58bb171660af5ced4edb93608':
Explicitly indicates that only bash is supported.
2010-07-09 14:31:43 -07:00
c2b3cc3a23
am fae32a91: merge from open-source master
...
Merge commit 'fae32a91bcc0c0f397ea681a245d32e759718618'
* commit 'fae32a91bcc0c0f397ea681a245d32e759718618':
Revert "acp: Ensure dst mtime always greater or equal to src mtime"
acp: Ensure dst mtime always greater or equal to src mtime
2010-07-09 14:29:43 -07:00
47bc4e3407
merge from open-source master
...
Change-Id: Ia02a590164d87ae98c714ac7d408ff7f241ae1fa
2010-07-09 14:28:20 -07:00
fae32a91bc
merge from open-source master
...
Change-Id: Iecaa5654c4829e51b687bf5bc4be2215ffbad66a
2010-07-09 14:26:40 -07:00
56997a98c3
am 1599ddd0: am 0d205521: Merge "Enforce 64-bit build environment" into gingerbread
...
Merge commit '1599ddd08529465aef8f205bd6fce28f16d2ec37'
* commit '1599ddd08529465aef8f205bd6fce28f16d2ec37':
Enforce 64-bit build environment
2010-07-09 14:13:10 -07:00
1599ddd085
am 0d205521: Merge "Enforce 64-bit build environment" into gingerbread
...
Merge commit '0d205521ae4e8907bcc80774260a68c923970eca' into gingerbread-plus-aosp
* commit '0d205521ae4e8907bcc80774260a68c923970eca':
Enforce 64-bit build environment
2010-07-09 13:32:00 -07:00
0d205521ae
Merge "Enforce 64-bit build environment" into gingerbread
2010-07-09 13:30:14 -07:00
8884bf02d8
Fix build - USE_MINGW seems to be the preferred define
...
Change-Id: I57dd7f5029ed1fe3a74be7573a28fa894187b3a7
2010-07-09 13:25:41 -07:00
8565c6330f
Merge "acp: Ensure dst mtime always greater or equal to src mtime"
2010-07-09 12:49:19 -07:00
45ac434151
Refactor Stripper. Allow a stripper other than SOSLIM to be specified
...
Change-Id: I61137f5bb123dc5f610af9928ed3debdf85ba74d
Signed-off-by: Bruce Beare <brucex.j.beare@intel.com>
2010-07-09 12:16:46 -07:00
daea3fce40
Merge "Set arm specific variables to be empty for non-arm platforms"
2010-07-09 10:44:37 -07:00
0d09e587aa
Set arm specific variables to be empty for non-arm platforms
...
These variables are useless for non-arm platforms, and will
generate misleading messages during building process.
Change-Id: I37c46ac8d30f353333803d9591b65fca24ce3fd5
2010-07-09 11:54:27 +08:00
24d22be31c
acp: Ensure dst mtime always greater or equal to src mtime
...
When copying files from file systems that support high resolution
mtime, we should not truncating the nsec part. Instead we should
increase the dst mtime by one sec to prevent dst mtime to become less
than src mtime.
Change-Id: I2b4200c72c4e6ee8aae875b5e64701324799afc7
2010-07-09 11:03:14 +08:00
ec06d42152
am b0b2146b: am 38d2e1da: am b66a5c05: docs: modify redirect link text
...
Merge commit 'b0b2146bb7017c8f1b91ff4a4d05ed64a2b3a20f'
* commit 'b0b2146bb7017c8f1b91ff4a4d05ed64a2b3a20f':
docs: modify redirect link text
2010-07-08 19:10:07 -07:00
ee195f3365
am 8b0ecc08: am de6a0857: Fix broken interaction of JarJar and Emma.
...
Merge commit '8b0ecc08166a4e83a8df5864e5264a88962101f1'
* commit '8b0ecc08166a4e83a8df5864e5264a88962101f1':
Fix broken interaction of JarJar and Emma.
2010-07-08 19:09:53 -07:00
Ying Wang