Commit Graph

21290 Commits

Author SHA1 Message Date
Ying Wang 0757768f43 Build hostdex on only Linux.
Change-Id: I9213684e4c65632c54e9929f693f4b6a24beb95a
2015-01-26 09:52:28 -08: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 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 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 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
Dmitriy Ivanov 5586efa028 am 23396bfc: Merge "gdbclient: Improve error handling"
* commit '23396bfc8d613f9319bce836a49ae6ee7ad18c0b':
  gdbclient: Improve error handling
2015-01-23 00:50:38 +00:00
Ying Wang 6aa932cabf Merge "Add dependency of import_includes on LOCAL_MODULE_MAKEFILE" 2015-01-23 00:14:26 +00:00
Dmitriy Ivanov 23396bfc8d Merge "gdbclient: Improve error handling" 2015-01-23 00:02:42 +00: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
Dmitriy Ivanov dfff170148 gdbclient: Improve error handling
Print error message when unable to resolve exefile by pid

Change-Id: I5d04bdc348e5f95818ac90e29148947edfce42eb
2015-01-22 13:43:09 -08: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
Ying Wang f495c12557 am 507ea383: Merge "Let apicheck check both the public API and system API." into lmp-mr1-dev
* commit '507ea383aaaea5634c79d20911773aa44324e7f5':
  Let apicheck check both the public API and system API.
2015-01-22 20:41:09 +00:00
Ying Wang 507ea383aa Merge "Let apicheck check both the public API and system API." into lmp-mr1-dev 2015-01-22 20:36:53 +00: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 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 79834f371e am ae542c78: Merge "Revert "Add the default local_time hal implementation to builds.""
* commit 'ae542c785d11f1e62f20f4493e422fdf5749d397':
  Revert "Add the default local_time hal implementation to builds."
2015-01-22 00:13:34 +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
David Turner b6af64c3ea am 8be358bf: Merge "emulator: Include the ranchu sensors library"
* commit '8be358bf9a5407a379d4c4709c172b8c1ba6d4c7':
  emulator: Include the ranchu sensors library
2015-01-22 00:13:32 +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
Ying Wang ae542c785d Merge "Revert "Add the default local_time hal implementation to builds."" 2015-01-21 20:05:22 +00:00
Ying Wang 29a2987562 Merge "Running jarjar on Java resources." 2015-01-21 20:04:20 +00:00
Ying Wang 07acdbfd32 Running jarjar on Java resources.
Before this change, Java resources are added as a separate step
(add-java-resources-to-package) after dex is run, so jarjar isn't run on
the resource files.
With this change, we add Java resources immediately after we call javac,
so jarjar is run on the resource files (the module's own resource, as
well as resources carried by static Java libraries).
When we generate the final apk/jar, we use the jarjar'ed jar as the
inital pacakge file, with class files and empty folders removed.

(cherry-picked from commit 140274707e)

Bug: 18837479
Change-Id: I15ecf282bfb65fd53dd03fbd03dd4c71927c186a
2015-01-21 11:57:52 -08:00
David Turner 8be358bf9a Merge "emulator: Include the ranchu sensors library" 2015-01-21 19:42:54 +00:00
Christopher Ferris 9f9ccbfd6a Merge "Fix missing parenthesis." 2015-01-21 18:39:06 +00:00
Chih-Wei Huang 567ea28838 Revert "Add the default local_time hal implementation to builds."
Remove duplicate local_time.default.

This reverts commit a09c24db71.

Change-Id: Ic96d42235c14588d454e92a57b3bb9e74688fd99
2015-01-21 12:17:58 +08:00
Chih-Wei Huang 65ced619b1 Remove phone from frameworks/base subdirs
The directory no longer exists.

Change-Id: Id8d109818f06783d72dfc005595330f735b7e5cf
2015-01-21 12:07:28 +08:00
Christopher Ferris a8f5b8d0e2 Fix missing parenthesis.
Change-Id: Ib9eda50a6f9096dad35cf81ac3b3cdc26636a016
2015-01-20 18:23:05 -08:00
Ying Wang c0ff83aebd am 17967eb7: Merge "[MIPSR6] Adjust prebuilts/ndk libraries for mips32r6"
* commit '17967eb72f0eb7f495800d5065b64db4a0174362':
  [MIPSR6] Adjust prebuilts/ndk libraries for mips32r6
2015-01-16 18:32:18 +00:00
Dirk Dougherty 4433ac859c am d1283889: am 48141e05: am 5a97f244: am 529a107f: Add new subtab under Distribute tab.
* commit 'd12838890563b2fb4532630373760a995970f687':
  Add new subtab under Distribute tab.
2015-01-16 18:17:59 +00:00
Ying Wang 17967eb72f Merge "[MIPSR6] Adjust prebuilts/ndk libraries for mips32r6" 2015-01-16 18:13:36 +00:00
Duane Sand 1a07487493 [MIPSR6] Adjust prebuilts/ndk libraries for mips32r6
Change-Id: Ice2d0f65eced4fb7dd209fb15610ba555dd45f2c
2015-01-16 18:13:17 +00:00
Dirk Dougherty d128388905 am 48141e05: am 5a97f244: am 529a107f: Add new subtab under Distribute tab.
* commit '48141e05994ce939b2becab40d86482bda3d9090':
  Add new subtab under Distribute tab.
2015-01-16 18:11:03 +00:00
Dirk Dougherty 48141e0599 am 5a97f244: am 529a107f: Add new subtab under Distribute tab.
* commit '5a97f24411df6ca7221343ac93f25decb99b6bea':
  Add new subtab under Distribute tab.
2015-01-16 18:03:42 +00:00
Miao Wang eb66dc39a9 am 62d49dc5: Merge "Make bcc-compat able to pick the right mtriple flag for Renderscript Compat Lib."
* commit '62d49dc5db94a5452b87aa3b31cb623987356f51':
  Make bcc-compat able to pick the right mtriple flag for Renderscript Compat Lib.
2015-01-16 16:44:17 +00:00
Miao Wang 50ef904068 am 2b942f87: Merge "Add build rules for libRSSupportIO (Usage_IO lib for RS compat lib)"
* commit '2b942f87f6b74ad9c5381fa96dcb1d46f155779b':
  Add build rules for libRSSupportIO (Usage_IO lib for RS compat lib)
2015-01-16 16:44:15 +00:00
Miao Wang 62d49dc5db Merge "Make bcc-compat able to pick the right mtriple flag for Renderscript Compat Lib." 2015-01-16 16:34:16 +00:00
Miao Wang 2b942f87f6 Merge "Add build rules for libRSSupportIO (Usage_IO lib for RS compat lib)" 2015-01-16 16:33:53 +00:00
Narayan Kamath baf3eb93ee Add ro.product.locale
This is a BCP-47 language tag representing the default locale for a
given device. Support for the earlier mechanism of supplying a language
and region via ro.product.locale.region/language has been removed. This
change also removes support for supplying these properties via
PRODUCT_ADDITIONAL_PROPERTY_OVERRIDES. Devices that need to override
this should either rearrange their PRODUCT_LANGUAGES or supply a custom
.prop file.

bug: 17691569

Change-Id: I00c74098542b49b9c514a6ca39ea8d08179546c1
2015-01-16 10:16:52 +00:00
Dirk Dougherty 5a97f24411 am 529a107f: Add new subtab under Distribute tab.
* commit '529a107f9de5051b734fad4cecf1f971998aeade':
  Add new subtab under Distribute tab.
2015-01-16 00:58:59 +00:00
Ying Wang 758a029e2a am 59cbe2c6: Merge "Emit unique linker buildid in all binaries."
* commit '59cbe2c65cdd2dc3f1ef7a64a4bf6e3543d07207':
  Emit unique linker buildid in all binaries.
2015-01-16 00:28:48 +00:00