StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
6,329 Commits 1 Branch 0 Tags
abaf3d6bbd4cebb183f61ea41be994f4ed2c3d8c
Commit Graph

6329 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ying Wang
4b3987498e am c5033a33: Merge "x86: remove obsolete comments" 
* commit 'c5033a3357b824a8285da67357a0d289750f4a72':
  x86: remove obsolete comments
 2011-08-26 12:10:45 -07:00
Ying Wang
c5033a3357 Merge "x86: remove obsolete comments" 2011-08-26 10:41:16 -07:00
David 'Digit' Turner
9d99d7dfb8 resolved conflicts for merge of 6da54b6e to master 
Change-Id: Ic1e08fffacb66e8006877b7b5c51e9e7f03d39a2
 2011-08-26 00:53:34 +02:00
David 'Digit' Turner
3db43165b0 am 80d41e4b: am a2cc9b22: Merge "sdk: add DLL_EXTENSION as an atree variable" 
* commit '80d41e4b7555aed399c7bd23647947d7eade3fe6':
  sdk: add DLL_EXTENSION as an atree variable
 2011-08-25 14:30:00 -07:00
David 'Digit' Turner
6da54b6e0e resolved conflicts for merge of 7be88d00 to honeycomb-plus-aosp 
Change-Id: I2f1b26f737dcc521e5a81a660356468eca6d2717
 2011-08-25 23:23:32 +02:00
David 'Digit' Turner
80d41e4b75 am a2cc9b22: Merge "sdk: add DLL_EXTENSION as an atree variable" 
* commit 'a2cc9b227ae01803dfc4bc1987071fd6eee08bb6':
  sdk: add DLL_EXTENSION as an atree variable
 2011-08-25 12:14:35 -07:00
David 'Digit' Turner
7be88d00bb am 77c6261f: Merge "emulator: Enable GLES emulation libraries" 
* commit '77c6261fb074d87b75d669dd9fb9ab5a12a52cc9':
  emulator: Enable GLES emulation libraries
 2011-08-25 12:14:33 -07:00
David 'Digit' Turner
a2cc9b227a Merge "sdk: add DLL_EXTENSION as an atree variable" 2011-08-25 12:03:03 -07:00
David 'Digit' Turner
77c6261fb0 Merge "emulator: Enable GLES emulation libraries" 2011-08-25 12:02:34 -07:00
Jean-Baptiste Queru
d7d096df71 Tighten the toolchain version check 
Bug: 3076137
Change-Id: Ibd9f1f13916e31596f94a5b0a90293995da7f2cf
 2011-08-25 11:29:54 -07:00
David 'Digit' Turner
557c51f2ea sdk: add DLL_EXTENSION as an atree variable 
This patch defines the DLL_EXTENSION variable to the host
shared library suffix (i.e. either ".so", ".dll" or ".dylib")
when packaging the SDK.

This is required by another patch to sdk/build/tools.atree that
will use ${DLL_EXTENSION} to copy the GLES emulation host libraries
to $SDK/tools/lib

Change-Id: I120d39e905afb453b0702d5f0eb2707f214385cc
 2011-08-25 14:28:03 +02:00
Ying Wang
6e41a7483a Merge "Provide mechanism to override llvm-rs-cc headers." 2011-08-24 10:26:41 -07:00
Stephen Hines
d4136c0fc6 Provide mechanism to override llvm-rs-cc headers. 
Change-Id: I87fd496069a9dfde633e2d232e436fa5d7315cc0
 2011-08-23 22:01:49 -07:00
jeffhao
ca94f3583f Removing target-api option from build. 
This is cherry-picked from dalvik-dev.

Change-Id: I85cd23c08fcad400e6426cdaad079e91dcd9babf
 2011-08-23 14:18:24 -07:00
David 'Digit' Turner
43dd89d2a0 emulator: Enable GLES emulation libraries 
This patch enables the build of OpenGLES emulation libraries
(both in the guest and the host) for any emulator-specific
product config.

+ update core/main.mk to ensure that the right path is parsed
  when building the Windows SDK

Change-Id: Ifde047f8c0ef922504a7286c8c5b57f7c79c71f8
 2011-08-23 22:25:13 +02:00
Eric Laurent
9d78854f0f Merge "Fix issue 5094017: Media server crashes on ISC emulator." 2011-08-22 08:29:39 -07:00
David Hu
57afbd18af Merge "GPS Location Test Build Change" 2011-08-20 18:51:20 -07:00
Eric Laurent
7ed9efaab3 Fix issue 5094017: Media server crashes on ISC emulator. 
Add audio HAL and audio policy hardware module libraries to SDK image.

Change-Id: I96501b1493974ac1738f194f9457461766ea4bff
 2011-08-19 10:03:52 -07:00
Ying Wang
c7fd4a5a7b am 2bcdfe14: am 4651ee5d: am 7c7a8f02: Merge "Sort the results of findleaves again." 
* commit '2bcdfe145d485fc28e86700e4ed57ac67368de25':
  Sort the results of findleaves again.
 2011-08-19 09:36:56 -07:00
Ying Wang
2bcdfe145d am 4651ee5d: am 7c7a8f02: Merge "Sort the results of findleaves again." 
* commit '4651ee5db200772921bad828c280d165ff3997c3':
  Sort the results of findleaves again.
 2011-08-19 09:35:50 -07:00
Wink Saville
adf8136708 am 43c15339: (-s ours) Merge "DO NOT MERGE: resolved conflicts for merge of 15e199c8 to honeycomb-plus-aosp" into honeycomb-plus-aosp 
* commit '43c15339886bf6c6fb87527d86525da58542e790':
  DO NOT MERGE: Update hc-LTE PLATFORM_VERSION from 3.2 to 3.2.2.
 2011-08-19 09:34:14 -07:00
Ying Wang
4651ee5db2 am 7c7a8f02: Merge "Sort the results of findleaves again." 
* commit '7c7a8f023af38e7e8be7cbb6acbe1ab770cdd704':
  Sort the results of findleaves again.
 2011-08-19 09:32:40 -07:00
Wink Saville
43c1533988 Merge "DO NOT MERGE: resolved conflicts for merge of 15e199c8 to honeycomb-plus-aosp" into honeycomb-plus-aosp 2011-08-19 09:28:34 -07:00
Ying Wang
7c7a8f023a Merge "Sort the results of findleaves again." 2011-08-19 09:24:44 -07:00
Ishida, Haruyasu
58e52b434b Sort the results of findleaves again. 
Commit d36e945 changed findleaves.py to sort the output files so that
the order is deterministic and won't cause spurious build errors when
files happen to be listed (and hence read) in different order on
e.g. add/remove the makefiles.

This correction broke after commit 4820a94 because the conversion to
a set with set() in order to remove duplicates came after sort() and
potentially altered the order of the elements.

This commit fixes makes sure findleaves.py is guaranteed to return
a sorted filename list without duplicates.

Change-Id: Ifd96d04d45641fe43d4cc4739f78a2d4d25cc212
 2011-08-19 08:14:53 +02:00
Wink Saville
a436a66b9c DO NOT MERGE: Update hc-LTE PLATFORM_VERSION from 3.2 to 3.2.2. 
Change-Id: Ib30bf10669119b588c691e4cebdc8093f402e3e4
 2011-08-17 11:42:57 -07:00
The Android Automerger
d6535a0628 HLK42B 2011-08-17 11:42:41 -07:00
Raphael Moll
88833405c4 am cfdfad3f: am 807c7980: am 7d9fe517: Merge "Add sdk/rule_api to the Windows build paths." 
* commit 'cfdfad3fcadc8bba30f00dbe2f2e835d61cde9ef':
  Add sdk/rule_api to the Windows build paths.
 2011-08-17 11:36:25 -07:00
Raphael Moll
cfdfad3fca am 807c7980: am 7d9fe517: Merge "Add sdk/rule_api to the Windows build paths." 
* commit '807c79802d5e8b1613bf36bb780cf3250f443aa2':
  Add sdk/rule_api to the Windows build paths.
 2011-08-17 11:29:48 -07:00
Wink Saville
cd34366886 DO NOT MERGE: resolved conflicts for merge of 15e199c8 to honeycomb-plus-aosp 
Not merging this change, leaving version at 3.1.4.1.5.9.2.6.5

Change-Id: Ie9efac19da35cb72e8ae636dcfb8962a3c02ac94
 2011-08-17 11:27:01 -07:00
Raphael Moll
807c79802d am 7d9fe517: Merge "Add sdk/rule_api to the Windows build paths." 
* commit '7d9fe5174787a5638993a15b165bc9115c16da0f':
  Add sdk/rule_api to the Windows build paths.
 2011-08-17 11:26:07 -07:00
Raphael Moll
7d9fe51747 Merge "Add sdk/rule_api to the Windows build paths." 2011-08-17 11:06:39 -07:00
Wink Saville
15e199c857 DO NOT MERGE: Update hc-LTE PLATFORM_VERSION from 3.2 to 3.2.2. 
Change-Id: Ib30bf10669119b588c691e4cebdc8093f402e3e4
 2011-08-17 10:03:51 -07:00
Raphael Moll
408c7f8a8f Add sdk/rule_api to the Windows build paths. 
Change-Id: I4976b50d829e4b26b4f9935a1a184937dd115198
 2011-08-16 19:40:03 -07:00
Brian Swetland
d1975a2946 fix tiny android builds (add mksh) 
Change-Id: I0cf5068b6e9b350259009c5ecf7f2946d05f7b2d
 2011-08-16 16:15:26 -07:00
Ying Wang
0ba51ba565 Merge "Update build to properly use prebuilt llvm-rs-cc." 2011-08-15 11:15:51 -07:00
Ying Wang
bed0a19583 am 6d38bdfc: resolved conflicts for merge of a74a4811 to honeycomb-plus-aosp 
* commit '6d38bdfc7b9ff699370b4a40dcbdddce0ea713b8':
  sha module is deprecated
 2011-08-11 16:59:48 -07:00
Ying Wang
6d38bdfc7b resolved conflicts for merge of a74a4811 to honeycomb-plus-aosp 
Change-Id: I8400ac2bead6aa1a9902d44bf65906084ad353ad
 2011-08-11 16:55:00 -07:00
The Android Automerger
89b49883f7 HLK42 2011-08-11 14:33:43 -07:00
The Android Automerger
19fe3195bf merge in honeycomb-LTE-release history after reset to honeycomb-LTE 2011-08-11 14:33:13 -07:00
Ying Wang
a74a4811ae am 3f5326fd: Merge "sha module is deprecated" 
* commit '3f5326fd9fe2a5c46b4e6643e2b277e7f13cac04':
  sha module is deprecated
 2011-08-10 18:02:15 -07:00
Ying Wang
3f5326fd9f Merge "sha module is deprecated" 2011-08-10 17:50:05 -07:00
david
cad0bb9f62 sha module is deprecated 
This patch removes the deprecated warnings from the python
scripts.

Change-Id: I052a0aab3fb28dd1d78de1307edafda6b6c35e5f
 2011-08-10 17:48:04 -07:00
Stephen Hines
c963eae72c Update build to properly use prebuilt llvm-rs-cc. 
Change-Id: I52a83066b6c08d05d69db4f93631eeaf9c0b41c6
 2011-08-10 17:01:43 -07:00
Ying Wang
6ab5d6aa16 Discard hidden files when rounding up resource. 
Aapt will discard the hidden files anyway.
With this change, we can avoid unnecessary rebuild if a module has only
hidden files in its resource dir.

Change-Id: Iaf0a13e038cca5fb60012c550cc90f7abbe967e1
 2011-08-10 16:05:51 -07:00
The Android Open Source Project
aac78535cd Reconcile with gingerbread-release gingerbread-mr4-release honeycomb-LTE-release 
Change-Id: I96a28218361adfe4730e7c161cd5bd861976fbc6
 2011-08-10 07:28:42 -07:00
The Android Automerger
3fd9451190 GWK15G 
Change-Id: Ice488cd27f50a2f100e100d659c737d4bcc09f5c
 2011-08-09 17:47:42 -07:00
android-merger
cbfb43cbe2 GRK39 
Change-Id: Ia4b60a25edae6e8525710ffd11e30308eb22d0db
 2011-08-08 15:48:36 -07:00
android-merger
68afbc67ae GRJ90C 
Change-Id: I660b1710592f3bdc0847eb5e6b83dabfd2c7e44c
 2011-08-08 15:03:14 -07:00
The Android Automerger
d39e198497 HLK36B 2011-08-05 15:04:39 -07:00