StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
19,326 Commits 1 Branch 0 Tags
d036711427ff7ecbf603b51e04c75986504138d9
Commit Graph

5249 Commits

Author SHA1 Message Date
Brian Carlstrom
3f5ff08dc5 Only enable WITH_DEXPREOPT by default for libdvm.so 
Bug: 14298175

(cherry picked from commit 9f8e214a91)

Change-Id: I96ba4e198b7bc1b7d9a502c432590f41c87d05c4
 2014-05-29 09:38:04 -07:00
Brian Carlstrom
e469ea36ff am 9f8e214a: Only enable WITH_DEXPREOPT by default for libdvm.so 
* commit '9f8e214a919097284a88cb19a1b85ceafc202a67':
  Only enable WITH_DEXPREOPT by default for libdvm.so
 2014-05-29 16:37:20 +00:00
Brian Carlstrom
9f8e214a91 Only enable WITH_DEXPREOPT by default for libdvm.so 
Bug: 14298175
Change-Id: I42255a61667f88924a779fff1812134044c7b6b2
 2014-05-28 22:13:07 -07:00
Ying Wang
8b73a86834 am 834ec0ea: am d3ddfdf8: am b3bed595: Merge "Add a dummy build recipe for generated RS cpp files." 
* commit '834ec0ead591cf64a5f660af0210e95728e08c4f':
  Add a dummy build recipe for generated RS cpp files.
 2014-05-28 23:45:29 +00:00
Ying Wang
834ec0ead5 am d3ddfdf8: am b3bed595: Merge "Add a dummy build recipe for generated RS cpp files." 
* commit 'd3ddfdf847eaf44219943cda441273be85b01635':
  Add a dummy build recipe for generated RS cpp files.
 2014-05-28 23:41:42 +00:00
Ying Wang
d3ddfdf847 am b3bed595: Merge "Add a dummy build recipe for generated RS cpp files." 
* commit 'b3bed5952b44e69dc9e1988beb4092303084ef61':
  Add a dummy build recipe for generated RS cpp files.
 2014-05-28 23:38:46 +00:00
Ying Wang
b3bed5952b Merge "Add a dummy build recipe for generated RS cpp files." 2014-05-28 23:33:35 +00:00
Ying Wang
f0c4184852 am d40776aa: am 65afd710: Merge "Add a dummy build recipe for the proto generated header files" 
* commit 'd40776aa8800d62a182eeed82c3ac1cef90e69ab':
  Add a dummy build recipe for the proto generated header files
 2014-05-28 23:31:02 +00:00
Ying Wang
d40776aa88 am 65afd710: Merge "Add a dummy build recipe for the proto generated header files" 
* commit '65afd710a592390671beb5da15a87b127a5f2125':
  Add a dummy build recipe for the proto generated header files
 2014-05-28 23:28:58 +00:00
Ying Wang
65afd710a5 Merge "Add a dummy build recipe for the proto generated header files" 2014-05-28 23:26:01 +00:00
Ying Wang
81ab8339fe Add a dummy build recipe for generated RS cpp files. 
Previously the RS cpp files are generated by the timestamp rule. Though
we have the generated RS cpp files depend on the timestamp file, we
don't have a build recipe. In such case gmake does some "optimization"
that it skip recompiling the generated cpp files, because it assumes the
generated cpp files are already up to date even if the rs files have
been updated.

Bug: 15313144
Change-Id: Ie69ecd2c788057d3619f9c7d2a125d44c4a534a1
 2014-05-28 16:17:09 -07:00
Ying Wang
5186dac02b Add a dummy build recipe for the proto generated header files 
This fixed issue that gnumake skip updating the cpp file that includes
the generated header file when the .proto file gets updated.
For example:
Say a.cc includes b.pb.h, since b.pb.h is just byproduct of the rule
that generates b.pb.cc, and though we have dependency "b.pb.h :
b.pb.cc", but we don't have build recipe for that rule.
Gmake stupidly thinks that b.pb.h must not be updated in that case so
it skips all targets that depends on b.pb.h!
With the dumy build recipe, gmake now doesn't skip the depedent targets.

Bug: 13009798
Change-Id: I39adc09b7656bdd023f578fb8933667944fd974c
 2014-05-28 16:15:13 -07:00
Brian Carlstrom
9843e86395 am ed97938c: am 7df64f7c: Merge "Move to dalvik.vm.lib.2 to force default to libart" 
* commit 'ed97938caa7a1e7cde1d060ebbe6f6af1279188e':
  Move to dalvik.vm.lib.2 to force default to libart
 2014-05-28 23:13:28 +00:00
Brian Carlstrom
ee26bf6a84 resolved conflicts for merge of 7e127ebe to master 
Change-Id: I3f4eba3289c14da55d7d79ccf946b71dfc4062d1
 2014-05-28 16:02:45 -07:00
Brian Carlstrom
ed97938caa am 7df64f7c: Merge "Move to dalvik.vm.lib.2 to force default to libart" 
* commit '7df64f7c0d933e3a5f18e0d15402f62b819ef8f0':
  Move to dalvik.vm.lib.2 to force default to libart
 2014-05-28 22:31:44 +00:00
Ying Wang
1ef0a635f3 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

(cherry picked from commit 994c226b91)

Change-Id: I5469ef1994f2ba91a9c25126349156752fc35b4b
 2014-05-28 15:09:55 -07:00
Brian Carlstrom
31f5db27c6 Move to dalvik.vm.lib.2 to force default to libart 
Bug: 14298175

(cherry picked from commit 7e127ebe0b)

Change-Id: I0a94e01f46fcc074d8c8fd1e5558fb764ab47361
 2014-05-28 14:49:34 -07:00
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
Brian Carlstrom
7e127ebe0b Move to dalvik.vm.lib.2 to force default to libart 
Bug: 14298175
Change-Id: Ie4a716dddddc4d339fd4f47033f2c546a1ca118a
 2014-05-28 14:31:46 -07: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
Rick Zhang
6eea8e25fd add moto to vendor owner whitelist 
Change-Id: I63760a380a17fe096c2aff1133bba336ac8bd7f1
 2014-05-28 10:31:30 -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
212bc3271a fix build id 
Bug: 15264432

Change-Id: Ib937af1401a18e67a3dbac471c21231ebd9e3c85
(cherry picked from commit 44e1b0bd8a)
 2014-05-27 17:21:00 +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