StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
21,907 Commits 1 Branch 0 Tags
dead54fc06c397b51d624eaf0a5f18f0205b91a0
Commit Graph

6592 Commits

Author SHA1 Message Date
Ying Wang
723db51fdb am 7c05897b: am e937ac81: Merge "Add new build flag LOCAL_DONT_DELETE_JAR_DIRS." 
* commit '7c05897b69801e1945889a9b1a89b86bbbbbdd3a':
  Add new build flag LOCAL_DONT_DELETE_JAR_DIRS.
 2015-01-29 18:38:00 +00:00
Ying Wang
7c05897b69 am e937ac81: Merge "Add new build flag LOCAL_DONT_DELETE_JAR_DIRS." 
* commit 'e937ac814c7f4e1989509f94f7ac8ae5b28a3526':
  Add new build flag LOCAL_DONT_DELETE_JAR_DIRS.
 2015-01-29 18:05:13 +00:00
Fredrik Roubert
cc93f0c87c Add new build flag LOCAL_DONT_DELETE_JAR_DIRS. 
Normally the build function initialize-package-file will delete all
class files and all directory entries from JAR files, but sometimes
external projects (eg. ICU4J) depend on having directory entries in
their JAR files.

This change adds the flag LOCAL_DONT_DELETE_JAR_DIRS (analogous to the
flag LOCAL_DONT_DELETE_JAR_META_INF) which when set will skip deletion
of directory entries in initialize-package-file.

Change-Id: I4464b947b7528fca23925affa95e4071915f04d4
 2015-01-29 17:44:27 +00:00
Ying Wang
14bc97f615 am 75705338: am 1c1497a7: am cb73599b: Make dangling module names in PRODUCT_FACTORY_RAMDISK_MODULES non-fatal. 
* commit '75705338b7e8e1353503b53f10274fda5c3cf7bf':
  Make dangling module names in PRODUCT_FACTORY_RAMDISK_MODULES non-fatal.
 2015-01-28 00:42:49 +00:00
Yabin Cui
5ba2122f77 am d22d6a53: am 9560d317: Merge "Kill HAVE_PTHREADS." 
* commit 'd22d6a537d59e1453bc728810a0694f8871deedc':
  Kill HAVE_PTHREADS.
 2015-01-28 00:42:42 +00:00
Ying Wang
15afffebc3 am cf1f7bc9: am 1bc2c6af: Merge "Allow to build "winsdk-tools" alone." 
* commit 'cf1f7bc93297213811036cf331bc7ecce32119e7':
  Allow to build "winsdk-tools" alone.
 2015-01-28 00:42:20 +00:00
Bill Yi
ba7a817107 am d0279504: am 1cc3fa57: Merge "Remove platform/bootable/bootloader/legacy from pathmap" 
* commit 'd0279504c6a01f375d340c9e01c7e3b9c431811b':
  Remove platform/bootable/bootloader/legacy from pathmap
 2015-01-28 00:15:47 +00:00
Ying Wang
75705338b7 am 1c1497a7: am cb73599b: Make dangling module names in PRODUCT_FACTORY_RAMDISK_MODULES non-fatal. 
* commit '1c1497a7f6c07899feae0ae57a7e2003d60045ae':
  Make dangling module names in PRODUCT_FACTORY_RAMDISK_MODULES non-fatal.
 2015-01-28 00:06:17 +00:00
Ying Wang
cb73599b25 Make dangling module names in PRODUCT_FACTORY_RAMDISK_MODULES non-fatal. 
It's pain to maintain an inactive product's list of
PRODUCT_FACTORY_RAMDISK_MODULES or PRODUCT_FACTORY_BUNDLE_MODULES.
Just show a warning if a module name becomes dangling.

Bug: 18779515
Change-Id: I3d137ed59feb005b186ed2a3519465da3d8f45c3
 2015-01-27 15:49:21 -08:00
Yabin Cui
d22d6a537d am 9560d317: Merge "Kill HAVE_PTHREADS." 
* commit '9560d31716319be62c97d929f6172c84e267a673':
  Kill HAVE_PTHREADS.
 2015-01-27 23:12:05 +00:00
Yabin Cui
9560d31716 Merge "Kill HAVE_PTHREADS." 2015-01-27 22:59:46 +00:00
Yabin Cui
0d1f0f8e5a Kill HAVE_PTHREADS. 
Bug: 19083585
Change-Id: I5be0d2f95c3c45e7f67de6a8daeb49709ef1f9e9
 2015-01-27 14:34:36 -08:00
Ying Wang
cf1f7bc932 am 1bc2c6af: Merge "Allow to build "winsdk-tools" alone." 
* commit '1bc2c6af5b73d6d448452b8bcb75222fbc81a532':
  Allow to build "winsdk-tools" alone.
 2015-01-27 22:13:25 +00:00
Ying Wang
ff1fe68514 Allow to build "winsdk-tools" alone. 
Allow to run "make winsdk-tools" without building the full win_sdk.

Bug: 19149444
Change-Id: If98495035f4f84dbcab7af2a74434e589bbfd4d1
 2015-01-27 22:01:12 +00:00
Bill Yi
d0279504c6 am 1cc3fa57: Merge "Remove platform/bootable/bootloader/legacy from pathmap" 
* commit '1cc3fa57985a3b159f9c93be32201999b8cfa605':
  Remove platform/bootable/bootloader/legacy from pathmap
 2015-01-27 21:59:48 +00:00
Bill Yi
5c3d75f5ea Remove platform/bootable/bootloader/legacy from pathmap 
BUG:19164048
Change-Id: Ib640db9be77a859a28c533190e3b5edacf84a412
 2015-01-27 13:47:05 -08:00
Ying Wang
40423825da am 21f78782: am 1b140e16: Merge "Build hostdex on only Linux." 
* commit '21f78782d5e59a58e664e9ae52f537cee314f407':
  Build hostdex on only Linux.
  Fix comma in $(if ...).
 2015-01-26 19:17:34 +00:00
Ying Wang
21f78782d5 am 1b140e16: Merge "Build hostdex on only Linux." 
* commit '1b140e16e1d8dd022331242fcd5a3a1e8548fa4b':
  Build hostdex on only Linux.
  Fix comma in $(if ...).
 2015-01-26 19:12:18 +00:00
Ying Wang
0757768f43 Build hostdex on only Linux. 
Change-Id: I9213684e4c65632c54e9929f693f4b6a24beb95a
 2015-01-26 09:52:28 -08:00
Yohann Roussel
f9a27f45b4 Fix host_dalvik_java_library with Jack 
Looks like this was a bad conflict resolution.

Change-Id: I7d2f3d51f1d6d9219ebec6c9342e17051c763168
 2015-01-26 16:14:43 +01:00
Dan Albert
cfc95cf435 Merge "Fix comma in $(if ...)." 2015-01-25 22:30:19 +00:00
Logan Chien
e481e7d494 Fix comma in $(if ...). 
Change-Id: I2f9fba5b5c0384ef12ee9e5f48fa01102436a425
 2015-01-25 21:15:12 +08:00
Dan Albert
0d963dc94f am f633e281: am 172cd765: Merge "Allow coverage with clang." 
* commit 'f633e28168a65a0d7a59fed069c90ca54b47de9f':
  Allow coverage with clang.
 2015-01-24 23:48:47 +00:00
Dan Albert
b89760a76b am 3723af1b: am 9ba25d6b: Merge "Enable host coverage." 
* commit '3723af1b4e8de4941d7b9be569f209d88f565964':
  Enable host coverage.
 2015-01-24 23:48:46 +00:00
Dan Albert
f633e28168 am 172cd765: Merge "Allow coverage with clang." 
* commit '172cd7653e4dfb628065349ea915329076e44e1d':
  Allow coverage with clang.
 2015-01-24 23:42:11 +00:00
Dan Albert
3723af1b4e am 9ba25d6b: Merge "Enable host coverage." 
* commit '9ba25d6bfd983655dc9c0584887db2b6cb3be999':
  Enable host coverage.
 2015-01-24 23:42:09 +00:00
Dan Albert
172cd7653e Merge "Allow coverage with clang." 2015-01-24 23:32:20 +00:00
Dan Albert
9ba25d6bfd Merge "Enable host coverage." 2015-01-24 23:32:16 +00:00
Dan Albert
2c03e04480 Allow coverage with clang. 
Note that this doesn't play nicely with acov out of the box. Clang
apparently generates .gcno files that aren't compatible with gcov-4.8.
This can be solved by installing gcc-4.6 and invoking lcov with
`--gcov-tool /usr/bin/gcov-4.6`.

http://stackoverflow.com/questions/17758126/clang-code-coverage-invalid-output

Change-Id: I79547e1c579fa79db47ff07d5e90c42cedbd5cbb
 2015-01-24 15:18:01 -08:00
Dan Albert
43e128acfc Enable host coverage. 
Don't remember why I didn't enable this for the host when I made the
first pass, but it works just fine.

Change-Id: I0892c0bc353bf8b60b432ba9f69f97281177d41d
 2015-01-24 13:24:19 -08:00
Chih-Hung Hsieh
afa30df68e am 6698ba3d: am 840bc269: Merge "Add -static to static link command, for clang." 
* commit '6698ba3d6c9efebac63c224a1fb985f0a53a501a':
  Add -static to static link command, for clang.
 2015-01-24 16:58:15 +00:00
Chih-Hung Hsieh
6698ba3d6c am 840bc269: Merge "Add -static to static link command, for clang." 
* commit '840bc269ee79363cd463d4e69cc5e590d80df1b6':
  Add -static to static link command, for clang.
 2015-01-24 01:16:28 +00:00
Chih-Hung Hsieh
840bc269ee Merge "Add -static to static link command, for clang." 2015-01-24 01:03:02 +00:00
Chih-Hung Hsieh
69b1fe6d1c Add -static to static link command, for clang. 
Clang driver needs -static flag, not -Bstatic,
to produce statically linked modules.
However, -static is not added if LDFLAGS contains -shared,
which is used in bionic/linker to create a shared object with static libraries.

BUG: 18008984

Change-Id: I75c3e24973ee77170285ec4c8e7aacc345722685
 2015-01-23 13:02:43 -08:00
Ying Wang
28aa610860 am de9b91b0: am 6aa932ca: Merge "Add dependency of import_includes on LOCAL_MODULE_MAKEFILE" 
* commit 'de9b91b01bc9baff333ea7fbb438e0e838fac204':
  Add dependency of import_includes on LOCAL_MODULE_MAKEFILE
 2015-01-23 03:11:04 +00:00
Ying Wang
de9b91b01b am 6aa932ca: Merge "Add dependency of import_includes on LOCAL_MODULE_MAKEFILE" 
* commit '6aa932cabf6ed14c35ae49b78464e2504af87c58':
  Add dependency of import_includes on LOCAL_MODULE_MAKEFILE
 2015-01-23 00:50:39 +00:00
Dianne Hackborn
c421abfcd5 Update version to MNC. 
Change-Id: I67a69efa90babcfbc3e83907e46be0833c0ddcdd
 2015-01-22 16:36:55 -08:00
Ying Wang
14d02a39b0 Add dependency of import_includes on LOCAL_MODULE_MAKEFILE 
So the build system regenerates import_includes when you modify
Android.mk to add a new dependency library.

Change-Id: Ic92b097b659bb68a9065e1d66da59e0dc7e2836a
 2015-01-22 15:44:04 -08:00
Ying Wang
9cfaba309f am febc6b56: am f495c125: am 507ea383: Merge "Let apicheck check both the public API and system API." into lmp-mr1-dev 
* commit 'febc6b567a909134bdc84a8e6e8c2681a07ca59b':
  Let apicheck check both the public API and system API.
 2015-01-22 20:53:24 +00:00
Ying Wang
febc6b567a am f495c125: am 507ea383: Merge "Let apicheck check both the public API and system API." into lmp-mr1-dev 
* commit 'f495c12557a0f152046122fc162d2fcfbf305a99':
  Let apicheck check both the public API and system API.
 2015-01-22 20:47:14 +00:00
Narayan Kamath
41759234f0 am 675a726f: resolved conflicts for merge of 8f5fc9e2 to lmp-mr1-dev-plus-aosp 
* commit '675a726fe4ca70beb1ecccb8c5f78dcc8f65cac8':
  Add ro.product.locale
 2015-01-22 19:58:04 +00:00
Ying Wang
cf8fee479b am 30a0031e: am 8768c6b7: Merge "Remove phone from frameworks/base subdirs" 
* commit '30a0031e4388a54890071e7c386b20c81509f27f':
  Remove phone from frameworks/base subdirs
 2015-01-22 19:58:04 +00:00
Ying Wang
4d26681f3d resolved conflicts for merge of 0f205ad9 to master 
Change-Id: Ic741805a0037d8d29d7d5ff6e2b6e83067943f12
 2015-01-22 11:54:58 -08:00
Narayan Kamath
675a726fe4 resolved conflicts for merge of 8f5fc9e2 to lmp-mr1-dev-plus-aosp 
Change-Id: Ie1587a4e2434b9cfbca16bc764e99e94511f8212
 2015-01-22 18:53:59 +00:00
Narayan Kamath
8f5fc9e246 Merge "Add ro.product.locale" 2015-01-22 14:04:53 +00:00
Ying Wang
833b427d72 Explicit dependency on hostdex classes.jar. 
Previously for hostdex Java libraries, we set up dependency on only
javalib.jar, which in turn is dependent on classes.jar.
But when jack is enabled there is no dependency of javalib.jar on
classes.jar. In commit b4c49cba57 classes.jar was universally added to
all host java library dependencies. That's unnecessary.

This change adds explicit dependency on classes.jar only for hostdex
modules.

On the other hand, if we switch checked module to $(full_classes_jack),
like what we did in commit 8bc90fd2d6, we won't need this to fix jack
build either, because classes.jar isn't needed when you run checkbuild.

Change-Id: I92c0e4d621d266f6e6914ab2b4f20e5531af070f
 2015-01-21 17:30:21 -08:00
Ying Wang
30a0031e43 am 8768c6b7: Merge "Remove phone from frameworks/base subdirs" 
* commit '8768c6b70b4b2957a5dda132650e8d6dec7c485e':
  Remove phone from frameworks/base subdirs
 2015-01-22 00:13:35 +00:00
Ying Wang
0f205ad959 am 29a29875: Merge "Running jarjar on Java resources." 
* commit '29a29875627758aa3c76aa5256641c1782c904bf':
  Running jarjar on Java resources.
 2015-01-22 00:13:33 +00:00
Christopher Ferris
8b62f12195 am 9f9ccbfd: Merge "Fix missing parenthesis." 
* commit '9f9ccbfd6a84e56df00c49b0aec25236b702e01d':
  Fix missing parenthesis.
 2015-01-22 00:13:30 +00:00
Ying Wang
8768c6b70b Merge "Remove phone from frameworks/base subdirs" 2015-01-21 20:06:59 +00:00