Commit Graph

24675 Commits

Author SHA1 Message Date
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
Christopher Wiley
bc2be461e4 Add build rules to generate native DBus interfaces
With this patch, we can now write Android makefiles like:

include $(CLEAR_VARS)
LOCAL_MODULE := dbus-binding-example
LOCAL_SRC_FILES := main.cpp \
                   dbus-service-config.json \
                   org.example.Daemon.Command.dbus.xml \
                   org.example.Daemon.Manager.dbus.xml
include $(BUILD_EXECUTABLE)

This will cause header files defining native DBus interfaces
to be generated.  These can be included from main.cpp to
easily expose object oriented interface over DBus.

Bug: 22608897
Change-Id: Ic4304ac8de77de74d6955ed17789e5477be9a53e
2015-07-31 11:14:35 -07: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
Benoit Lize
0e14dcc000 Add support-customtabs to the doc build.
b/22795013

Change-Id: I1363e5136ca15ea3089040d59de528c877fb53df
2015-07-31 17:36:37 +02:00
Paul Miller
4271a9b3ed Replace Browser with Browser2 and BookmarkProvider
Browser is going away. Browser2 is a tiny, WebView-based browser for
testing purposes. BookmarkProvider will take over the
"com.android.browser;browser" authorities and return empty Cursors for
all queries. See packages/apps/Browser2/README for how to obtain a
regular browser.

BUG:19351071
Change-Id: I8af605ec65a1185923598ba553a98e3fd9b887db
2015-07-30 18:12:21 -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
Tony Mantler
b362f89e15 am d9bb53f9: am 5915e57d: Merge "Add support preference libraries to docs build" into mnc-dev
* commit 'd9bb53f965caa4f961b822e63c486c2863b29a7c':
  Add support preference libraries to docs build
2015-07-30 20:11:07 +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