StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,351 Commits 1 Branch 0 Tags
cf68ba00d4b2388abc41396cc3d4d8864866bf0d
Commit Graph

4828 Commits

Author SHA1 Message Date
Ying Wang
cf68ba00d4 am dcf90646: am 8898f2e2: am f4999d3b: Merge "Fix pattern rules for for libdvm." 
* commit 'dcf90646b0122b09755014832a67b7c44bc2e1ac':
  Fix pattern rules for $(installed_odex) for libdvm.
 2014-05-28 21:36:11 +00:00
Ying Wang
dcf90646b0 am 8898f2e2: am f4999d3b: Merge "Fix pattern rules for for libdvm." 
* commit '8898f2e261d1bb2b389971803a1f4a23639ade9e':
  Fix pattern rules for $(installed_odex) for libdvm.
 2014-05-28 21:31:19 +00:00
Ying Wang
8898f2e261 am f4999d3b: Merge "Fix pattern rules for for libdvm." 
* commit 'f4999d3b8a0d09e790767176c543df1c2ad53c5a':
  Fix pattern rules for $(installed_odex) for libdvm.
 2014-05-28 21:28:42 +00:00
Ying Wang
994c226b91 Fix pattern rules for $(installed_odex) for libdvm. 
When the VM is libdvm, we don't put the odex files in an arch specific
subdirectory. The previous pattern rules don't work because of the extra
"/". With this change, % evaluates to empty string when it's built for
libdvm; % evaluates to "<arch_name>/" when it's built for libart.
Also removed use of $(create-empty-package), which may causes file name
(dummy) conflict with the rule of package.apk.

Bug: 15311527
Change-Id: I9f9089bc1896b78c1f47834afdb28a3a51d34480
 2014-05-28 14:23:26 -07:00
Ying Wang
9df5043594 resolved conflicts for merge of 536d4a76 to master 
Change-Id: Ib655d08e5c9272aef1fd1e130b5fb2b63148a55e
 2014-05-28 11:05:47 -07:00
Ying Wang
536d4a761b am 7e4c73d5: am aae7e3fa: Merge "Support LOCAL_CLANG with arch/bit suffix." 
* commit '7e4c73d5885402f5c301309094ce3dbceef0ecd3':
  Support LOCAL_CLANG with arch/bit suffix.
 2014-05-28 16:18:56 +00:00
Ying Wang
7e4c73d588 am aae7e3fa: Merge "Support LOCAL_CLANG with arch/bit suffix." 
* commit 'aae7e3fa66ecf6bf796ba9a107d8f066498ab10b':
  Support LOCAL_CLANG with arch/bit suffix.
 2014-05-28 16:14:54 +00:00
Vineeta Srivastava
1bd266d006 Merge "Add 'qti' to vendor whitelist" 2014-05-28 15:40:19 +00:00
Ajay Dudani
37a4b4ded9 Add 'qti' to vendor whitelist 
Bug: 15287127
Change-Id: I4440fb0428a345edb782888fe278b8fd6d809b5d
 2014-05-27 14:51:51 -07:00
Jeff Brown
bf59b8b340 Merge "Support more precise package exclusion from JAR files." 2014-05-27 21:46:57 +00:00
Ying Wang
824344af00 Support LOCAL_CLANG with arch/bit suffix. 
Precedence: LOCAL_CLANG_<arch> > LOCAL_CLANG_<32|64> > LOCAL_CLANG.

Bug: 15257067
Change-Id: I86b72f3bec162834591287d3b5231b5f40f9a431
 2014-05-27 13:06:08 -07:00
Dan Albert
49df673669 am cd74f307: am a5b0b130: am 3805f619: Merge "Revert "Fix for duplicate names in whole static libs"" 
* commit 'cd74f3073c4d0fa7d566705b0eb38c635c1c9344':
  Revert "Fix for duplicate names in whole static libs"
 2014-05-27 19:50:55 +00:00
Dan Albert
cd74f3073c am a5b0b130: am 3805f619: Merge "Revert "Fix for duplicate names in whole static libs"" 
* commit 'a5b0b1303d38fb1cd31575383c647eb8b1db5e36':
  Revert "Fix for duplicate names in whole static libs"
 2014-05-27 19:47:08 +00:00
Dan Albert
a5b0b1303d am 3805f619: Merge "Revert "Fix for duplicate names in whole static libs"" 
* commit '3805f619156163eab8ad92fd51b4a431be1287bd':
  Revert "Fix for duplicate names in whole static libs"
 2014-05-27 19:44:19 +00:00
Dan Albert
3805f61915 Merge "Revert "Fix for duplicate names in whole static libs"" 2014-05-27 19:41:46 +00:00
Dan Albert
3c12b5c02b Revert "Fix for duplicate names in whole static libs" 
This reverts commit 0e5ce8be34.

Change-Id: I68b776cb915fd7be8299ddb2899907046dddadf3
 2014-05-27 19:30:36 +00:00
Dan Albert
d8303d9021 am e6918b55: am 212772f6: am 31101623: Merge "Fix for duplicate names in whole static libs" 
* commit 'e6918b559d911fd58dc03b60e4b866b23c935f72':
  Fix for duplicate names in whole static libs
 2014-05-27 18:33:19 +00:00
Dan Albert
e6918b559d am 212772f6: am 31101623: Merge "Fix for duplicate names in whole static libs" 
* commit '212772f6322ef41a1b18023d15eb2b69efa19be8':
  Fix for duplicate names in whole static libs
 2014-05-27 18:30:08 +00:00
Dan Albert
212772f632 am 31101623: Merge "Fix for duplicate names in whole static libs" 
* commit '31101623b3e621436f6b46f49242ed4642d86164':
  Fix for duplicate names in whole static libs
 2014-05-27 18:26:38 +00:00
Dan Albert
31101623b3 Merge "Fix for duplicate names in whole static libs" 2014-05-27 18:23:26 +00:00
Ying Wang
bccdab8737 am 65475feb: am 29267309: am 294301bb: Merge "Exclude libstdc++ and libgcc if libc++ is requested." 
* commit '65475feb5999068096b287faac9199d1c8e18340':
  Exclude libstdc++ and libgcc if libc++ is requested.
 2014-05-27 17:59:11 +00:00
Ying Wang
65475feb59 am 29267309: am 294301bb: Merge "Exclude libstdc++ and libgcc if libc++ is requested." 
* commit '292673094c59bf235a8ba188c2736199f6082105':
  Exclude libstdc++ and libgcc if libc++ is requested.
 2014-05-27 17:55:35 +00:00
Ying Wang
292673094c am 294301bb: Merge "Exclude libstdc++ and libgcc if libc++ is requested." 
* commit '294301bb34b62d51305d70780ac031a905fa9efe':
  Exclude libstdc++ and libgcc if libc++ is requested.
 2014-05-27 17:52:10 +00:00
Guang Zhu
44e1b0bd8a fix build id 
Change-Id: Ib937af1401a18e67a3dbac471c21231ebd9e3c85
 2014-05-26 22:06:13 -07:00
Jeff Brown
4c4aa99ced Support more precise package exclusion from JAR files. 
Allow LOCAL_JAR_PACKAGES to work on subpackages.  Previously it
only worked on top-level packages due to a bug in how the directories
were recursively deleted.

Add LOCAL_JAR_EXCLUDE_PACKAGES to allow specific subpackages to
be excluded.  This rule applies after LOCAL_JAR_PACKAGES has
selected which packages to include.  It may also be used independently.

Change-Id: Ibd0e495be1a20c84b59c9da132e92100ef3f8705
 2014-05-23 18:41:19 -07:00
Dan Albert
0e5ce8be34 Fix for duplicate names in whole static libs 
_extract-and-include-single-(host|target)-whole-static-lib was written such that
only the first file of a given name would be extracted and included into the new
library. This patch iterates over each identically named archive member,
extracts them individually, and adds them to the new archive.

Bug: 15110069
Change-Id: Ia08c7be6f40bfc8403908a8808898ada479099b1
 2014-05-23 18:23:47 -07:00
Ying Wang
d90de32951 Exclude libstdc++ and libgcc if libc++ is requested. 
Bug: 15174002
Change-Id: I24fe428c3520f76cd61f0660b59ba18a1f2d2dad
 2014-05-23 16:42:37 -07:00
Ying Wang
1dc4f0bace am 2bf10a72: am cdcb6926: am 6cb69bd4: Merge "Add HOST_PREFER_32_BIT to support 32-bit-by-default multilib build" 
* commit '2bf10a72f87a8e97923286aa331f7db81e2361ca':
  Add HOST_PREFER_32_BIT to support 32-bit-by-default multilib build
 2014-05-23 19:43:57 +00:00
The Android Automerger
543644393b am d7a59dd0: "AAV52B" 
* commit 'd7a59dd0ebdabaea5f9f3fd91ff86e18d2beebf7':
  "AAV52B"
 2014-05-23 18:22:17 +00:00
Ying Wang
2bf10a72f8 am cdcb6926: am 6cb69bd4: Merge "Add HOST_PREFER_32_BIT to support 32-bit-by-default multilib build" 
* commit 'cdcb6926d40b502ed89a285cdd4d99beb4cf8009':
  Add HOST_PREFER_32_BIT to support 32-bit-by-default multilib build
 2014-05-23 17:48:27 +00:00
Ying Wang
cdcb6926d4 am 6cb69bd4: Merge "Add HOST_PREFER_32_BIT to support 32-bit-by-default multilib build" 
* commit '6cb69bd4f20ac3ae3a7d5b5cc323c4480cf8ef75':
  Add HOST_PREFER_32_BIT to support 32-bit-by-default multilib build
 2014-05-23 17:44:31 +00:00
Ying Wang
6cb69bd4f2 Merge "Add HOST_PREFER_32_BIT to support 32-bit-by-default multilib build" 2014-05-23 17:39:40 +00:00
Colin Cross
949ed75bb9 am 423242b5: am 828b5183: am e45c8607: Merge changes Ibc943b75,Ib4ccf373,I30ff439b,I7bde0130 
* commit '423242b59ea01dffbb7f79c7c045528f7c351c4b':
  set a prebuilt directory name for the 2nd arch
  add vendor directories to gdb shared library search path
  add 2nd arch gcc to the path
  fix paths when 2nd arch gcc is a different version
 2014-05-22 19:40:46 +00:00
Colin Cross
423242b59e am 828b5183: am e45c8607: Merge changes Ibc943b75,Ib4ccf373,I30ff439b,I7bde0130 
* commit '828b518377f69516ea6cbb9ad160d81ced6980d5':
  set a prebuilt directory name for the 2nd arch
  add vendor directories to gdb shared library search path
  add 2nd arch gcc to the path
  fix paths when 2nd arch gcc is a different version
 2014-05-22 19:36:15 +00:00
Colin Cross
828b518377 am e45c8607: Merge changes Ibc943b75,Ib4ccf373,I30ff439b,I7bde0130 
* commit 'e45c8607b3e2cf7a428a91898aea2752a54389a1':
  set a prebuilt directory name for the 2nd arch
  add vendor directories to gdb shared library search path
  add 2nd arch gcc to the path
  fix paths when 2nd arch gcc is a different version
 2014-05-22 19:31:26 +00:00
Colin Cross
e45c8607b3 Merge changes Ibc943b75,Ib4ccf373,I30ff439b,I7bde0130 
* changes:
  set a prebuilt directory name for the 2nd arch
  add vendor directories to gdb shared library search path
  add 2nd arch gcc to the path
  fix paths when 2nd arch gcc is a different version
 2014-05-22 19:28:01 +00:00
Colin Cross
12d18eb563 set a prebuilt directory name for the 2nd arch 
In order to install 32-bit gdbserver on a 64-bit build,
prebuilts/misc/Android.mk needs to know the prebuilt directory name
for the 2nd arch.

Change-Id: Ibc943b758eb9404f7f5f9fbbd8720cc67f6a6f01
 2014-05-22 12:01:23 -07:00
Ying Wang
ae9ee9c0e7 am 71617605: am 8e2b2d8a: am b0143e2f: Merge "Add some more flags to CLANG_CONFIG_UNKNOWN_CFLAGS" 
* commit '716176059ab8962c7049f91c83c82b1af9f2632a':
  Add some more flags to CLANG_CONFIG_UNKNOWN_CFLAGS
 2014-05-22 18:28:06 +00:00
Ying Wang
716176059a am 8e2b2d8a: am b0143e2f: Merge "Add some more flags to CLANG_CONFIG_UNKNOWN_CFLAGS" 
* commit '8e2b2d8ad4040d501d4d254cd359cf17ea32bbdd':
  Add some more flags to CLANG_CONFIG_UNKNOWN_CFLAGS
 2014-05-22 17:47:40 +00:00
Ying Wang
8e2b2d8ad4 am b0143e2f: Merge "Add some more flags to CLANG_CONFIG_UNKNOWN_CFLAGS" 
* commit 'b0143e2fffbd3183175e8c1873d3466598ca9457':
  Add some more flags to CLANG_CONFIG_UNKNOWN_CFLAGS
 2014-05-22 17:43:14 +00:00
Ying Wang
b0143e2fff Merge "Add some more flags to CLANG_CONFIG_UNKNOWN_CFLAGS" 2014-05-22 17:38:01 +00:00
The Android Automerger
d7a59dd0eb "AAV52B" 2014-05-22 07:23:17 -07:00
Ying Wang
78ae0ad8df am 913e0317: am a72e6f80: am 8a3f514d: Merge "Split the rules to build the odex file" 
* commit '913e031793928981640f51fa2e6480312f044c37':
  Split the rules to build the odex file
 2014-05-22 02:38:52 +00:00
Ying Wang
913e031793 am a72e6f80: am 8a3f514d: Merge "Split the rules to build the odex file" 
* commit 'a72e6f80e447acf225822eebdf752c0d8aa2590c':
  Split the rules to build the odex file
 2014-05-22 02:34:02 +00:00
Ying Wang
a72e6f80e4 am 8a3f514d: Merge "Split the rules to build the odex file" 
* commit '8a3f514d44e2c1d4920126b3edd47f7a7616b732':
  Split the rules to build the odex file
 2014-05-22 02:29:52 +00:00
Ying Wang
8a3f514d44 Merge "Split the rules to build the odex file" 2014-05-22 02:24:59 +00:00
Dmitriy Ivanov
70917bcebc am 4ebdc93f: am caabca37: am 5caca89c: Merge "Clarify multiarch warnings" 
* commit '4ebdc93f6039b5429c8bbff74373657de6be02b8':
  Clarify multiarch warnings
 2014-05-22 01:31:32 +00:00
Dmitriy Ivanov
4ebdc93f60 am caabca37: am 5caca89c: Merge "Clarify multiarch warnings" 
* commit 'caabca3786e105abb88728b4d5c4c1436be66ba3':
  Clarify multiarch warnings
 2014-05-22 01:28:53 +00:00
Dmitriy Ivanov
caabca3786 am 5caca89c: Merge "Clarify multiarch warnings" 
* commit '5caca89c5d66e9999e26905522bf2eed958d0961':
  Clarify multiarch warnings
 2014-05-22 01:24:48 +00:00
Ying Wang
9734252ccf Don't build tests in PDK build. 
Change-Id: I8994be0938a3ce87a097669c28b232fd04b77a36
 2014-05-21 17:45:52 -07:00