Commit graph

22083 commits

Author SHA1 Message Date
Christopher Wiley
7d1be40047 am 5923fcd0: Merge "Add build rules to generate native DBus interfaces"
* commit '5923fcd02131abfd1bc8f39704edc6c7e8100154':
  Add build rules to generate native DBus interfaces
2015-08-05 15:46:44 +00:00
Christopher Wiley
5923fcd021 Merge "Add build rules to generate native DBus interfaces" 2015-08-05 15:40:00 +00:00
Paul Miller
fa977ff366 am 09185f5a: Merge "Replace Browser with Browser2 and BookmarkProvider"
* commit '09185f5a8f943aeac3d6ace37a73870f5eedc6f4':
  Replace Browser with Browser2 and BookmarkProvider
2015-08-04 23:26:56 +00:00
Paul Miller
09185f5a8f Merge "Replace Browser with Browser2 and BookmarkProvider" 2015-08-04 23:20:29 +00:00
Ying Wang
bd555f1523 resolved conflicts for merge of d86f39ca to stage-aosp-master
Change-Id: Ifceb6705eeaaacc9f49788bc0e37a27e398beef0
2015-08-04 13:36:07 -07:00
Ying Wang
d86f39cab7 Merge "Ignore .*.java files when collecting .java files." 2015-08-04 19:52:06 +00:00
Ying Wang
4aedea90e8 Ignore .*.java files when collecting .java files.
Bug: 22934689
Change-Id: I6c9cc8f37d09eb190946e596e5d1ba0c3b318088
2015-08-04 12:46:13 -07:00
Ying Wang
5c78a488d0 am fd43aa8a: Merge "Fix writing clean_steps.mk in the first build."
* commit 'fd43aa8a02d8415121694b4edd15ea8d549a7d3d':
  Fix writing clean_steps.mk in the first build.
2015-08-04 19:21:38 +00:00
Ying Wang
fd43aa8a02 Merge "Fix writing clean_steps.mk in the first build." 2015-08-04 19:14:57 +00:00
Ying Wang
eadaa954ce Fix writing clean_steps.mk in the first build.
Change-Id: Ieddc799f38e5d1522e329e8300bd9f49c26c70ae
2015-08-04 12:11:54 -07:00
Ying Wang
32350fc547 am 5c3adca4: Merge "Don\'t prepend CC_WRAPPER to CLANG."
* commit '5c3adca4011db8fd98a3b7beab76b5b02cbab063':
  Don't prepend CC_WRAPPER to CLANG.
2015-08-03 21:18:48 +00:00
Ying Wang
5c3adca401 Merge "Don't prepend CC_WRAPPER to CLANG." 2015-08-03 21:13:37 +00:00
Ying Wang
3e3d7b5ce5 Don't prepend CC_WRAPPER to CLANG.
We have deferred the CC_WRAPPER prepending to binary.mk per module.

Bug: 22612634
Change-Id: If2c0549503989d17ff7be619fdd49c26fd78f0a5
(cherry-pick from commit 66c8e8c756)
2015-08-03 14:08:54 -07: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
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
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
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
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
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
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
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
51e2e5893d Merge "Remove the now-empty darwin AndroidConfig.h." 2015-07-30 16:19:25 +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
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
cf427fb4ae Merge "Don't define S_IRGRP in AndroidConfig.h." 2015-07-30 03:43:38 +00:00
Elliott Hughes
24ed450ad9 am f07ddab1: Merge "Remove global Windows __BEGIN_DECLS/__END_DECLS."
* commit 'f07ddab187df78a7be32289506f5eca051339f75':
  Remove global Windows __BEGIN_DECLS/__END_DECLS.
2015-07-30 03:32:29 +00:00
Elliott Hughes
f07ddab187 Merge "Remove global Windows __BEGIN_DECLS/__END_DECLS." 2015-07-30 03:20:36 +00:00
Elliott Hughes
61c94258b1 Remove global Windows __BEGIN_DECLS/__END_DECLS.
Change-Id: Ic1ba634a0376c9c1b484098b4ca41cf7659f06b1
2015-07-29 20:14:59 -07:00
Elliott Hughes
47b557a9ca Don't define S_IRGRP in AndroidConfig.h.
Nothing seems to be relying on this anyway.

Change-Id: I24e2509e4d24bc445961430bb74f8ca04135bc37
2015-07-29 19:26:39 -07:00