Commit graph

21936 commits

Author SHA1 Message Date
Ying Wang
956dcccf76 Move Java stuff out of base_rules.mk
- Moved the target-only .aidl and .logtag rules to java.mk.
- Moved the .proto rules,  Java library dependency calculation,
  Java resource processing and Java-related
  target-specific and global variables setup to a new java_common.java,
  which is shared by both target and host Java modules.
- Minor cleanup for the moved code.

Bug: 23597357
Change-Id: Ic3eb72e26bb1a663e5739abe0a935f96b88bc352
2015-08-28 17:17:19 -07:00
Elliott Hughes
4548e7f49d Merge "Remove AndroidConfig.h." 2015-08-28 19:47:36 +00:00
Tao Bao
35da9685f0 Merge "Use the basename of file_contexts from the info dict." 2015-08-28 18:33:25 +00:00
Tao Bao
79735a6a82 Use the basename of file_contexts from the info dict.
Changes in [1] break the backward compatibility of the OTA scripts. Fix
the issue by extracting the file basename from the info dict in
META/misc_info.txt.

[1] commit d3a803e668

Bug: 23620049
Change-Id: I40a5625bbe0beb295f34b2328906a4a4283fe59b
2015-08-28 11:17:38 -07:00
Elliott Hughes
43146118aa Remove AndroidConfig.h.
This change leaves soong references.

Change-Id: Iee32b6b97ad9711f69e999c9d01f01d71562b63f
2015-08-28 10:31:28 -07:00
Dan Willemsen
57ff23b0ed Merge "Add support for LOCAL_SRC_FILES_(host)_(arch)" 2015-08-28 03:39:34 +00:00
Dan Willemsen
85ac8d2a00 Add support for LOCAL_SRC_FILES_(host)_(arch)
For boringssl, which has architecture specific host assembly files

Bug: 23566667

Change-Id: Ia4602d28e93a1b3d1400cf95417b5e446c5fb84b
2015-08-28 03:38:43 +00:00
Dan Willemsen
d5deac8db9 Merge "Add _(darwin|linux|windows)" 2015-08-28 03:37:30 +00:00
Dan Willemsen
7a5498568f Add _(darwin|linux|windows)
So that we can support building both linux and windows binaries at the
same time on a linux host. This replaces the ifeq($(HOST_OS),...) checks
in Android.mk files.

Bug: 23566667

Change-Id: I693e11984e36d55bb6f09fa0d49bc485463e16fb
2015-08-28 03:36:22 +00:00
Tao Bao
6458fd96d5 Merge "rangelib.py: Fix the bug in monotonic check." 2015-08-27 19:16:06 +00:00
Tao Bao
e8f756137c rangelib.py: Fix the bug in monotonic check.
RangeSet("2-10").monotonic gives a wrong result of "False". Fix the bug
and add more tests into test_rangelib.py.

Change-Id: I04780571b45ecafd34040f405756b9745a9e21a5
2015-08-26 21:16:43 -07:00
Tao Bao
14342066db Merge "Add unit tests for rangelib.py." 2015-08-26 23:26:54 +00:00
Tao Bao
873a15e267 Add unit tests for rangelib.py.
Separate the test cases in rangelib.py comments into a python unittest
file.

To invoke:
  $ python -m unittest test_rangelib

Change-Id: I59e4ce0aaccc83bcbb42fee15775683dcd559d99
2015-08-26 16:13:18 -07:00
Tao Bao
95708eea4e Merge "Split large files for BBOTA v3." 2015-08-26 19:39:31 +00:00
Tao Bao
9a5caf2c30 Split large files for BBOTA v3.
For BBOTA v3, we need to stash source blocks to support resumable
feature. However, with the growth of file size and the shrink of the
cache size, source blocks that represent a file are too large to be
stashed as a whole. CL in [1] solves the issue by replacing the diff
command with a "new" command. However, it may increase the generated
package size substantially (e.g. from ~100MB to ~400MB).

With this CL, if a file spans too many blocks, we split it into smaller
pieces by generating multiple commands. For the same case above, it
reduces the package size to ~150MB.

One potential downside is that after splitting, files like .jar,
.apk and .zip can no longer use imgdiff. We may lose the potential
benefit of using imgdiff for patch size reduction.

[1] commit 82c47981bd

Bug: 22430577
Change-Id: I5684fab0ac41c8d94fe18f52a34cef77e06f741c
2015-08-26 10:50:11 -07:00
Nick Kralevich
36d91b5352 Merge "Only allow toolbox exec where /system exec was already allowed." 2015-08-25 22:41:57 +00:00
Ying Wang
a7eaf45078 Merge "Dist the otatools package." 2015-08-25 17:12:36 +00:00
Stephen Smalley
75770de701 Only allow toolbox exec where /system exec was already allowed.
When the toolbox domain was introduced, we allowed all domains to exec it
to avoid breakage.  However, only domains that were previously allowed the
ability to exec /system files would have been able to do this prior to the
introduction of the toolbox domain.  Remove the rule from domain.te and add
rules to all domains that are already allowed execute_no_trans to system_file.
Requires coordination with device-specific policy changes with the same Change-Id.

Change-Id: Ie46209f0412f9914857dc3d7c6b0917b7031aae5
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
2015-08-25 11:46:12 -04:00
Ying Wang
267e957373 Dist the otatools package.
Bug: 23495952
Change-Id: I1f61946580dd8ea29c3d5e1f4e859cc6d1f8554a
2015-08-24 17:13:53 -07:00
Tom Cherry
bcbd4eb9fb Merge "remove TARGET_PROVIDES_INIT_RC" 2015-08-24 23:23:36 +00:00
Tom Cherry
2df35aea43 remove TARGET_PROVIDES_INIT_RC
Change-Id: I765b80d48333f54fb995e4ccfd77d38683c6cbb9
2015-08-24 13:55:02 -07:00
Christopher Wiley
4e719eafc4 Merge "Change .dbus.xml extension to .dbus-xml" 2015-08-21 20:46:21 +00:00
Shinichiro Hamaji
39c7d24339 Merge "Use goma when USE_GOMA=true is set" 2015-08-21 03:24:27 +00:00
Elliott Hughes
6f5341259c Merge "Fix Linux host checkbuilds." 2015-08-20 23:56:07 +00:00
Elliott Hughes
ac9eea9463 Fix Linux host checkbuilds.
Turns out that thanks to 9d59f41776 we actually
build *all* the host libraries both 32- and 64-bit. Rather than fix the
libraries (or fixing things so we don't build stuff we don't need) right now,
let's just put _FILE_OFFSET_BITS and _LARGEFILE_SOURCE back.

Change-Id: I6c2d6a6919d1518f775e0d6c050e2c774994c5bd
2015-08-20 16:52:47 -07:00
Elliott Hughes
a3fa59b12b Merge "Kill host Linux AndroidConfig.h." 2015-08-20 23:10:05 +00:00
Elliott Hughes
ded991b47d Merge "Revert "Fix Windows SDK build."" 2015-08-20 21:23:59 +00:00
Elliott Hughes
73042ea0c7 Revert "Fix Windows SDK build."
This reverts commit b8dd176441.

This wasn't the problem, and mingw doesn't even use _LARGEFILE_SOURCE. The real problem (using WIN32 instead of _WIN32 in external/llvm) is fixed now.

Change-Id: I2b708a006b530cb18d03b1425cd65edda35ee17e
2015-08-20 21:22:19 +00:00
Elliott Hughes
a6065996cd Merge "Stop defining WIN32." 2015-08-20 21:21:01 +00:00
Elliott Hughes
f0c04c7b2e Stop defining WIN32.
Change-Id: Iac0b4745579e6de55bea02571617ae561308e1a9
2015-08-20 14:04:18 -07:00
Ying Wang
11a38e7a91 Merge "Support LOCAL_INIT_RC." 2015-08-20 20:47:53 +00:00
Ying Wang
9fe15ac757 Support LOCAL_INIT_RC.
A module can install a companion init.rc file,
by specifying:
LOCAL_INIT_RC := <init.rc-file-path-replative-to-LOCAL_PATH>
You can also use the variant with _32 or _64 suffix.

Bug: 23186545
Change-Id: I00a96509f5707ae39361a0c5555fa59d46c90322
2015-08-20 12:15:15 -07:00
Elliott Hughes
e31dfe965f Kill host Linux AndroidConfig.h.
We only build 64-bit now anyway.

Change-Id: I4bc9487522d215234509510bee66e4f210d86765
2015-08-20 11:14:23 -07:00
Elliott Hughes
999fd4ea85 Merge "Also -DWIN32 to keep llvm building." 2015-08-20 18:11:18 +00:00
Elliott Hughes
0823ad3300 Also -DWIN32 to keep llvm building.
Change-Id: Ic8e70f35dda23226d60010a38cf5633840772310
2015-08-20 11:10:22 -07:00
Elliott Hughes
79b199b80e Merge "Fix Windows SDK build." 2015-08-20 17:20:45 +00:00
Elliott Hughes
b8dd176441 Fix Windows SDK build.
I forgot that removing a file doesn't cause a rebuild in our lame build
system, so I hadn't actually tested my previous change.

Change-Id: Ida19d4a8fd40e37029031eac4b4ca5f0cc5c895b
2015-08-20 10:19:26 -07:00
Elliott Hughes
57069e5974 Merge "Remove Windows AndroidConfig.h." 2015-08-20 16:59:03 +00:00
Elliott Hughes
f8241b41d5 Remove Windows AndroidConfig.h.
The only things left that we're using are the Windows target version
and _FILE_OFFSET_BITS=64, and they can go in the combo .mk.

Also fix the unused Windows 64 .mk.

Change-Id: I5f2458d67c0a8201196a339573f861bbf18b7eb8
2015-08-20 09:56:52 -07:00
Christopher Wiley
9b17dea308 Change .dbus.xml extension to .dbus-xml
Work around gyp's inability to handle compound extensions by expecting
a similar looking simple extension for XML files definine DBus
interfaces.  We'll need to rename these sources in the places we're
using them already.

Bug: 23380180
Change-Id: Ieb2050f3ef05456cd70de65c3e128d57a6a508f8
2015-08-20 09:36:08 -07:00
Shinichiro Hamaji
ee482fd521 Use goma when USE_GOMA=true is set
With USE_GOMA, the path to gomacc in $GOMA_DIR or $HOME/goma
will be appended to CC_WRAPPER and CXX_WRAPPER.

Note this works only with USE_NINJA. Unlike ninja, GNU make
cannot change the parallelism depending on targets. Specifying
-j500 to GNU make would mean you may run 500 local jobs in
parallel, but with -j32 goma will just slow down the build.

Change-Id: I0f571454fd2a5b525ee29b445f7ab8715927ca00
2015-08-20 14:33:44 +09:00
Shinichiro Hamaji
e7d6f04d32 Merge "Add two flags for the latest ckati" 2015-08-20 05:25:34 +00:00
Dan Albert
6b966aff43 Merge "Fix sanitizer choice for global vs module." 2015-08-20 05:07:34 +00:00
Dan Albert
4c40141a91 Fix sanitizer choice for global vs module.
The sanitizer chosen by the environment (either by SANITIZE_TARGET or
SANITIZE_HOST) should be chosen over the one specified by the module.

Bug: http://b/23330588
Change-Id: I835b7d76e071fc0db2f859f98dfb9d7ff76af245
2015-08-19 20:24:23 -07:00
Elliott Hughes
b3c585d745 Merge "Stop defining HAVE_MS_C_RUNTIME." 2015-08-19 22:09:32 +00:00
Christopher Wiley
9e3b4ed499 Merge "Fix DBus proxies to use all definitions" 2015-08-19 21:39:28 +00:00
Elliott Hughes
19fa8413ed Stop defining HAVE_MS_C_RUNTIME.
Change-Id: Ie491547552ba64d60d669b74115da96a0fcced18
2015-08-19 14:22:59 -07:00
Christopher Wiley
974b82259a Fix DBus proxies to use all definitions
Bug: 22608897
Change-Id: Id17cf4b896c1c62be874599c7f346f3045e36819
2015-08-19 13:48:53 -07:00
Christopher Wiley
4d2b79f99e Merge "Generate DBus proxies and adaptors separately" 2015-08-19 18:30:20 +00:00
Christopher Wiley
529f176ee1 Generate DBus proxies and adaptors separately
Enable daemons exposing an interface over DBus to easily
build client libraries.  Now daemons can write rules like:

include $(CLEAR_VARS)
LOCAL_MODULE := libdbus-binding-example-client
LOCAL_DBUS_PROXY_PREFIX := dbus-example-example
LOCAL_SRC_FILES := \
    dbus_bindings/org.chromium.Example.Manager.dbus.xml \
    dbus_bindings/dbus-service-config.json
include $(BUILD_SHARED_LIBRARY)

to expose a client library.

While here, add support for generating independent adaptor header
files on a per interface basis.

Bug: 22608897
Change-Id: I011f9afc234811c31e445898321c2731c482fa77
2015-08-19 11:14:16 -07:00