Commit Graph

21259 Commits

Author SHA1 Message Date
Elliott Hughes 21a0c8629c am 67c4d916: Merge "Remove unused property."
* commit '67c4d916f5294e47e3da275664bb55f4518300f3':
  Remove unused property.
2015-01-29 16:51:52 +00:00
Elliott Hughes 67c4d916f5 Merge "Remove unused property." 2015-01-29 16:22:54 +00:00
Elliott Hughes 7419722205 Remove unused property.
Change-Id: I14cfccf104881fdbca2b926e289b90e4bfad1c32
2015-01-28 22:43:43 -08:00
Jesse Zhao 5827eec013 am fbc8c145: am 0c9384d5: Merge "verify system and vendor image together before patching." into lmp-mr1-dev
* commit 'fbc8c1454e8f2167635398078bb53033dc90f15d':
  verify system and vendor image together before patching.
2015-01-28 23:42:18 +00:00
Jesse Zhao fbc8c1454e am 0c9384d5: Merge "verify system and vendor image together before patching." into lmp-mr1-dev
* commit '0c9384d512cab94b761dcb82325e4411cbaf52c0':
  verify system and vendor image together before patching.
2015-01-28 23:35:57 +00:00
Jesse Zhao 0c9384d512 Merge "verify system and vendor image together before patching." into lmp-mr1-dev 2015-01-28 23:30:54 +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 1c1497a7f6 am cb73599b: Make dangling module names in PRODUCT_FACTORY_RAMDISK_MODULES non-fatal.
* commit 'cb73599b25098b3513feda11ca5cb17d77fec83e':
  Make dangling module names in PRODUCT_FACTORY_RAMDISK_MODULES non-fatal.
2015-01-28 00:00:09 +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 1bc2c6af5b Merge "Allow to build "winsdk-tools" alone." 2015-01-27 22:01:27 +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 1cc3fa5798 Merge "Remove platform/bootable/bootloader/legacy from pathmap" 2015-01-27 21:52:35 +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 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 1b140e16e1 Merge "Build hostdex on only Linux." 2015-01-26 18:43:17 +00:00
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