Commit Graph

24487 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 60df344458 am 0247fe72: am 16d0b4cf: am 66c8e8c7: Don\'t prepend CC_WRAPPER to CLANG.
* commit '0247fe72c05eb27ffb20f14d4b05458bb8641a38':
  Don't prepend CC_WRAPPER to CLANG.
2015-08-03 21:36:32 +00:00
Ying Wang 0247fe72c0 am 16d0b4cf: am 66c8e8c7: Don\'t prepend CC_WRAPPER to CLANG.
* commit '16d0b4cff1b643ee6bb70a3cf4541f34c4bc2210':
  Don't prepend CC_WRAPPER to CLANG.
2015-08-03 21:28:49 +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 25b1afe4a6 am 7d3ad604: am b139ae07: am 22354d3c: Merge "Add support for system images that contain the root directory"
* commit '7d3ad6040a31c417eae10e12ab990f7f628239ad':
  Add support for system images that contain the root directory
2015-08-03 18:08:52 +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 7d3ad6040a am b139ae07: am 22354d3c: Merge "Add support for system images that contain the root directory"
* commit 'b139ae078c8b2598889c2fde1a39a9d64f27dc62':
  Add support for system images that contain the root directory
2015-08-03 17:57:23 +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
Dianne Hackborn bf8b57b45f am cdbcce02: (-s ours) am 969016a3: am f4dbf25a: am 4b4244cb: am 56866c4d: Merge "Remove M codename, version number is 6.0." into mnc-dev
* commit 'cdbcce029c03ee025aecb669bd99cb4eeae7cf69':
  Remove M codename, version number is 6.0.
2015-08-01 17:52:25 +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
Dianne Hackborn 969016a37c am f4dbf25a: am 4b4244cb: am 56866c4d: Merge "Remove M codename, version number is 6.0." into mnc-dev
* commit 'f4dbf25a6eaa5de12f33f60d8161ac87c1388173':
  Remove M codename, version number is 6.0.
2015-08-01 16:51:31 +00:00
Dianne Hackborn f4dbf25a6e am 4b4244cb: am 56866c4d: Merge "Remove M codename, version number is 6.0." into mnc-dev
* commit '4b4244cb03bb6f5339859c4631717fe0ddeec4e8':
  Remove M codename, version number is 6.0.
2015-08-01 16:34:31 +00:00
Dan Albert 87c6d4a7db am c9fca90f: am 4982ef9d: am 010f652e: Merge "Add system/core to the PYTHONPATH."
* commit 'c9fca90f4fb44887bde4c2e3671dc0db21c0d6e8':
  Add system/core to the PYTHONPATH.
2015-08-01 15:57:28 +00:00
Gina Dimino 3288753018 am 09516826: am a5bacf6e: am 44c5e346: Merge "Docs: Add Google Feedback link to the footer for SAC pages."
* commit '09516826f10a07901208c24b42917400242f7a7c':
  Docs: Add Google Feedback link to the footer for SAC pages.
2015-08-01 15:57:27 +00:00
Dan Albert c9fca90f4f am 4982ef9d: am 010f652e: Merge "Add system/core to the PYTHONPATH."
* commit '4982ef9d76d4ca7189e56377a4032d8fe68fd994':
  Add system/core to the PYTHONPATH.
2015-08-01 15:48:35 +00:00
Gina Dimino 09516826f1 am a5bacf6e: am 44c5e346: Merge "Docs: Add Google Feedback link to the footer for SAC pages."
* commit 'a5bacf6e0c21c459e94f2e91a40aa60ee05bc382':
  Docs: Add Google Feedback link to the footer for SAC pages.
2015-08-01 15:48:11 +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 b139ae078c am 22354d3c: Merge "Add support for system images that contain the root directory"
* commit '22354d3c496e2c21f873758d996878e68c2607bb':
  Add support for system images that contain the root directory
2015-08-01 00:17:21 +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 22354d3c49 Merge "Add support for system images that contain the root directory" 2015-08-01 00:10:02 +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 e6853b0d63 Add support for system images that contain the root directory
When the root directory is included in system, the assumption that
system is mounted at /system breaks down. Redirect /system to /
in that case.

Change-Id: I8031b32d7cb9ca699c1cc22939e28afce9d1c847
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
Dan Albert 4982ef9d76 am 010f652e: Merge "Add system/core to the PYTHONPATH."
* commit '010f652ee7a9398f46b1c635c6bd186f7c7f8853':
  Add system/core to the PYTHONPATH.
2015-07-31 20:54:56 +00:00
Dan Albert 010f652ee7 Merge "Add system/core to the PYTHONPATH." 2015-07-31 20:48:17 +00:00
Dan Albert 515ab1e2d1 Add system/core to the PYTHONPATH.
There's an adb Python interface now, and system/core needs to be in
the PYTHONPATH for `import adb` to find it.

Change-Id: I712767a2ba96cb017ce5857dc367e4cacf2ec51f
2015-07-31 13:38:47 -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
Gina Dimino a5bacf6e0c am 44c5e346: Merge "Docs: Add Google Feedback link to the footer for SAC pages."
* commit '44c5e346cbf3fc2313699f142c6e17b9ef915aec':
  Docs: Add Google Feedback link to the footer for SAC pages.
2015-07-31 18:53:28 +00:00
Gina Dimino 44c5e346cb Merge "Docs: Add Google Feedback link to the footer for SAC pages." 2015-07-31 18:47:20 +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
Tao Bao bcd7ae6f30 Merge "build: Fix "adb shell" in recovery for system_root_image." 2015-07-31 16:43:59 +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
Gina Dimino f9a5ae53ce Docs: Add Google Feedback link to the footer for SAC pages.
Bug: 8906018
Change-Id: Id53b8a4421e01cef0ea1609efde1e29eb2a50f47
2015-07-30 13:54:48 -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 c2a1c8dac8 am b362f89e: am d9bb53f9: am 5915e57d: Merge "Add support preference libraries to docs build" into mnc-dev
* commit 'b362f89e1588fb309d5bc5be02f9aecdaff1c7c1':
  Add support preference libraries to docs build
2015-07-30 20:18:16 +00:00