Commit Graph

7757 Commits

Author SHA1 Message Date
Ying Wang 27c9e3ea48 am dc6d2ada: am 60df3444: am 0247fe72: am 16d0b4cf: am 66c8e8c7: Don\'t prepend CC_WRAPPER to CLANG.
* commit 'dc6d2adaa851386ee01036db9a00912bd29a5115':
  Don't prepend CC_WRAPPER to CLANG.
2015-08-03 21:54:48 +00:00
Ying Wang dc6d2adaa8 am 60df3444: am 0247fe72: am 16d0b4cf: am 66c8e8c7: Don\'t prepend CC_WRAPPER to CLANG.
* commit '60df344458f75ed9100e03f6012a73daf52d0807':
  Don't prepend CC_WRAPPER to CLANG.
2015-08-03 21:45:41 +00:00
Ying Wang 16d0b4cff1 am 66c8e8c7: Don\'t prepend CC_WRAPPER to CLANG.
* commit '66c8e8c756fb1790cac792b32ba2de057c3b1b4e':
  Don't prepend CC_WRAPPER to CLANG.
2015-08-03 21:20:54 +00:00
Ying Wang 66c8e8c756 Don't prepend CC_WRAPPER to CLANG.
We have deferred the CC_WRAPPER prepending to binary.mk per module.

Bug: 22612634
Change-Id: If2c0549503989d17ff7be619fdd49c26fd78f0a5
2015-08-03 14:06:58 -07:00
Ying Wang 292a528f11 am 178b20db: am ede3e310: am 2c0c1e56: Merge "Build 64-bit host tools in Linux/Mac SDK build."
* commit '178b20dbf4ddb3b32eb2230f41aca25c138b632f':
  Build 64-bit host tools in Linux/Mac SDK build.
2015-08-03 18:08:54 +00:00
Daniel Rosenberg 6344247985 am 0f49fed7: am c26fddcc: am e4fed421: Merge "build: core: Fix issue in recovery"
* commit '0f49fed7cfcb08221e91f1a6a9934bfbbde970cf':
  build: core: Fix issue in recovery
2015-08-03 18:08:53 +00:00
Daniel Rosenberg 85e6106db7 am 68fd2113: am 545f226d: am 46afd7f9: Merge "Add ro.build.system_root_image"
* commit '68fd21137b09523ebaa3748e57d7eedd0d0ec2ef':
  Add ro.build.system_root_image
2015-08-03 18:08:50 +00:00
Ying Wang 178b20dbf4 am ede3e310: am 2c0c1e56: Merge "Build 64-bit host tools in Linux/Mac SDK build."
* commit 'ede3e3103565175fc15b76cd6f9daf7e2b93393b':
  Build 64-bit host tools in Linux/Mac SDK build.
2015-08-03 18:02:04 +00:00
Daniel Rosenberg 0f49fed7cf am c26fddcc: am e4fed421: Merge "build: core: Fix issue in recovery"
* commit 'c26fddcc5be8876854fe3b44c0c48a0c47de8c07':
  build: core: Fix issue in recovery
2015-08-03 17:57:24 +00:00
Daniel Rosenberg 68fd21137b am 545f226d: am 46afd7f9: Merge "Add ro.build.system_root_image"
* commit '545f226db0978639aba41f16f623a395dad4209c':
  Add ro.build.system_root_image
2015-08-03 17:56:45 +00:00
Ying Wang ede3e31035 am 2c0c1e56: Merge "Build 64-bit host tools in Linux/Mac SDK build."
* commit '2c0c1e56dbbaa3abf1d25796c94d6a31594b307e':
  Build 64-bit host tools in Linux/Mac SDK build.
2015-08-01 17:30:34 +00:00
Ying Wang 2c0c1e56db Merge "Build 64-bit host tools in Linux/Mac SDK build." 2015-08-01 17:23:20 +00:00
Dianne Hackborn cdbcce029c am 969016a3: am f4dbf25a: am 4b4244cb: am 56866c4d: Merge "Remove M codename, version number is 6.0." into mnc-dev
* commit '969016a37c7f7894d110c6855b2cc364bb37690b':
  Remove M codename, version number is 6.0.
2015-08-01 17:03:34 +00:00
Daniel Rosenberg c26fddcc5b am e4fed421: Merge "build: core: Fix issue in recovery"
* commit 'e4fed421d5939469bf35cd6430300207a0ff4901':
  build: core: Fix issue in recovery
2015-08-01 00:17:22 +00:00
Daniel Rosenberg 545f226db0 am 46afd7f9: Merge "Add ro.build.system_root_image"
* commit '46afd7f981406e47740c46253aa16af1ab78eb9c':
  Add ro.build.system_root_image
2015-08-01 00:12:59 +00:00
Daniel Rosenberg e4fed421d5 Merge "build: core: Fix issue in recovery" 2015-08-01 00:10:09 +00:00
Daniel Rosenberg 46afd7f981 Merge "Add ro.build.system_root_image" 2015-08-01 00:05:05 +00:00
Daniel Rosenberg 7b82656984 build: core: Fix issue in recovery
Now that symlinks are created at build time, the rsync while
making recovery runs into issues around the etc symlink

Change-Id: Ie781507b22e4661629840075b274eaab2f712de6
2015-07-31 16:52:21 -07:00
Daniel Rosenberg 59156a6b7d Add ro.build.system_root_image
ro.build.system_root_image is true if the root directory is built
into the system image.

Change-Id: I17208ebd004c63aebb09db6c3e5f795619e73bd2
2015-07-31 16:52:21 -07:00
Dianne Hackborn 4b4244cb03 am 56866c4d: Merge "Remove M codename, version number is 6.0." into mnc-dev
* commit '56866c4d0e31bbc65e333754bb69accb2b0f4a36':
  Remove M codename, version number is 6.0.
2015-07-31 19:42:26 +00:00
Dianne Hackborn 56866c4d0e Merge "Remove M codename, version number is 6.0." into mnc-dev 2015-07-31 17:37:50 +00:00
Tao Bao fa752c84e2 am b2416d8e: resolved conflicts for merge of bbb41a70 to mnc-dr-dev-plus-aosp
* commit 'b2416d8e5c6ce31edb40df6fb3998716940575b9':
  build: Fix "adb shell" in recovery for system_root_image.
2015-07-31 17:09:11 +00:00
Tao Bao b2416d8e5c resolved conflicts for merge of bbb41a70 to mnc-dr-dev-plus-aosp
Change-Id: Icc2ed1632cf023785ddfbae09478ea0ffb025167
2015-07-31 10:01:09 -07:00
Tao Bao bbb41a7097 am bcd7ae6f: Merge "build: Fix "adb shell" in recovery for system_root_image."
* commit 'bcd7ae6f30149a2296d7288c74ffe6c90188f93d':
  build: Fix "adb shell" in recovery for system_root_image.
2015-07-31 16:49:30 +00:00
Ying Wang 5c28bda966 Build 64-bit host tools in Linux/Mac SDK build.
With this we build 32-bit host tools in only MinGW Windows build.

Bug: 22776595
Change-Id: Icca02b0f629460449a3437ff1769d4d081e92413
2015-07-31 09:24:15 -07:00
Tao Bao be46a54589 build: Fix "adb shell" in recovery for system_root_image.
For system images that contain the root directory, "adb shell" in
recovery stops working if the image is mounted at "/system", because
sh now locates at /system/system/bin/sh. We fix the issue by mounting
the image on /system_root and create a symlink to /system_root/system
for /system.

Bug: 22855115
Change-Id: Ia6b257b75aeb67687c3909063d1725a23a5ccd60
2015-07-30 16:44:17 -07:00
Tony Mantler ce9a5a0d98 am 23dfd922: am c2a1c8da: am b362f89e: am d9bb53f9: am 5915e57d: Merge "Add support preference libraries to docs build" into mnc-dev
* commit '23dfd922a6f53dc829c5765ef4a687d967f98244':
  Add support preference libraries to docs build
2015-07-30 20:33:52 +00:00
Tony Mantler 23dfd922a6 am c2a1c8da: am b362f89e: am d9bb53f9: am 5915e57d: Merge "Add support preference libraries to docs build" into mnc-dev
* commit 'c2a1c8dac8c319dfa4f6a75ef1ebbd0c9ddcb97b':
  Add support preference libraries to docs build
2015-07-30 20:26:20 +00:00
Tony Mantler d9bb53f965 am 5915e57d: Merge "Add support preference libraries to docs build" into mnc-dev
* commit '5915e57db504914c02d36e8f8cc18767c40f9c2d':
  Add support preference libraries to docs build
2015-07-30 20:02:55 +00:00
Tony Mantler 5915e57db5 Merge "Add support preference libraries to docs build" into mnc-dev 2015-07-30 19:56:08 +00:00
Dan Albert 52a611fdc5 am 08f911a7: am 35a8ae7b: am 8427c587: Merge "Make TSAN easier to use."
* commit '08f911a7e9b1bf46a93abc94bc16cb7e4dacb051':
  Make TSAN easier to use.
2015-07-30 19:10:17 +00:00
Dan Albert 08f911a7e9 am 35a8ae7b: am 8427c587: Merge "Make TSAN easier to use."
* commit '35a8ae7b734b18740c40d44983ad2536541a2c09':
  Make TSAN easier to use.
2015-07-30 19:02:27 +00:00
Dan Albert 35a8ae7b73 am 8427c587: Merge "Make TSAN easier to use."
* commit '8427c5878c56c96b9384a89cb6dc00e30cd5bbfa':
  Make TSAN easier to use.
2015-07-30 18:55:24 +00:00
Dan Albert 8427c5878c Merge "Make TSAN easier to use." 2015-07-30 18:44:19 +00:00
Tony Mantler c8b469aec5 Add support preference libraries to docs build
b/22795957

Change-Id: Ia8e02fd7726102f524a16f2f84e9c2bdd4d37f8f
2015-07-30 11:22:24 -07:00
Elliott Hughes e117f45f26 am 3ff1267d: am 1341e88c: am 524a7e46: Merge "Remove HAVE_WINSOCK."
* commit '3ff1267d9db6b94c759029229b61f6bfecaa5964':
  Remove HAVE_WINSOCK.
2015-07-30 17:44:44 +00:00
Elliott Hughes 3ff1267d9d am 1341e88c: am 524a7e46: Merge "Remove HAVE_WINSOCK."
* commit '1341e88c575a87bf1f4a05871fed78fad0fbe797':
  Remove HAVE_WINSOCK.
2015-07-30 17:38:38 +00:00
Elliott Hughes 1341e88c57 am 524a7e46: Merge "Remove HAVE_WINSOCK."
* commit '524a7e46937c59cfb34289819fd3ac117911cd8d':
  Remove HAVE_WINSOCK.
2015-07-30 17:31:47 +00:00
Elliott Hughes 524a7e4693 Merge "Remove HAVE_WINSOCK." 2015-07-30 17:24:06 +00:00
Dan Albert a6311b7212 Make TSAN easier to use.
TSAN is not supported on 32-bit architectures. For non-multilib cases,
make its use an error. For multilib cases, don't use it for the 32-bit
case.

Change-Id: I8e40be4002379cc2c9aa98ab8b812b337d6e077e
2015-07-30 10:17:33 -07:00
Elliott Hughes 0b2f643aa7 am cdb8a9ac: am 49f80c6f: am 51e2e589: Merge "Remove the now-empty darwin AndroidConfig.h."
* commit 'cdb8a9acaddc8dcc69b5af9282d31b73df957e59':
  Remove the now-empty darwin AndroidConfig.h.
2015-07-30 16:38:59 +00:00
Elliott Hughes cdb8a9acad am 49f80c6f: am 51e2e589: Merge "Remove the now-empty darwin AndroidConfig.h."
* commit '49f80c6f3795a4f3a888ca80e15b15204f4b61b5':
  Remove the now-empty darwin AndroidConfig.h.
2015-07-30 16:32:56 +00:00
Elliott Hughes 49f80c6f37 am 51e2e589: Merge "Remove the now-empty darwin AndroidConfig.h."
* commit '51e2e5893d5bcf62d12e041a60ed99f2a03758be':
  Remove the now-empty darwin AndroidConfig.h.
2015-07-30 16:25:10 +00:00
Elliott Hughes 7f80a9ed44 Remove the now-empty darwin AndroidConfig.h.
Change-Id: Icdbb06514c099653923aae936c31abfbaeaccf7a
2015-07-30 09:16:01 -07:00
Elliott Hughes af8574db2e am c73b8a80: am 4887ee3b: am cf427fb4: Merge "Don\'t define S_IRGRP in AndroidConfig.h."
* commit 'c73b8a80d421356b1389c1e45deba641ae12c423':
  Don't define S_IRGRP in AndroidConfig.h.
2015-07-30 04:24:07 +00:00
Elliott Hughes c73b8a80d4 am 4887ee3b: am cf427fb4: Merge "Don\'t define S_IRGRP in AndroidConfig.h."
* commit '4887ee3bdd6c1333b339eefee6d5f09300bbe14b':
  Don't define S_IRGRP in AndroidConfig.h.
2015-07-30 04:12:52 +00:00
Elliott Hughes b91d45e808 am 11d02d84: am 24ed450a: am f07ddab1: Merge "Remove global Windows __BEGIN_DECLS/__END_DECLS."
* commit '11d02d84097d0341dc53865060d417abb6872687':
  Remove global Windows __BEGIN_DECLS/__END_DECLS.
2015-07-30 04:00:16 +00:00
Elliott Hughes 4887ee3bdd am cf427fb4: Merge "Don\'t define S_IRGRP in AndroidConfig.h."
* commit 'cf427fb4ae19449d0c0ecbc86b88f37b5fcb0f05':
  Don't define S_IRGRP in AndroidConfig.h.
2015-07-30 03:58:47 +00:00
Elliott Hughes 11d02d8409 am 24ed450a: am f07ddab1: Merge "Remove global Windows __BEGIN_DECLS/__END_DECLS."
* commit '24ed450ad949ea06ac8cf1ecb0e8713c78edacfa':
  Remove global Windows __BEGIN_DECLS/__END_DECLS.
2015-07-30 03:45:23 +00:00
Elliott Hughes cf427fb4ae Merge "Don't define S_IRGRP in AndroidConfig.h." 2015-07-30 03:43:38 +00:00