Commit graph

359 commits

Author SHA1 Message Date
Dan Willemsen
85a918b8bb am c222a10d: am d1746299: am 57ff23b0: Merge "Add support for LOCAL_SRC_FILES_(host)_(arch)"
* commit 'c222a10d0682161ee852c3e0ed9f75b7bedba0ca':
  Add support for LOCAL_SRC_FILES_(host)_(arch)
2015-08-28 19:03:01 +00:00
Dan Willemsen
bebe2a340f am 00cf9d50: am 399c59f3: am d5deac8d: Merge "Add _(darwin|linux|windows)"
* commit '00cf9d5008b2f54a4d82a997016cb827643c1193':
  Add _(darwin|linux|windows)
2015-08-28 19:03:00 +00:00
Dan Willemsen
d174629951 am 57ff23b0: Merge "Add support for LOCAL_SRC_FILES_(host)_(arch)"
* commit '57ff23b0ed02affce494d14d8a0f5e9e4717baf7':
  Add support for LOCAL_SRC_FILES_(host)_(arch)
2015-08-28 03:49:02 +00:00
Dan Willemsen
399c59f3aa am d5deac8d: Merge "Add _(darwin|linux|windows)"
* commit 'd5deac8db951ec0a1c9edd806ea1758b836f8c46':
  Add _(darwin|linux|windows)
2015-08-28 03:49:01 +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
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
Ying Wang
2f0207ee64 am 7e3ba1b7: am 8a3241e3: am 11a38e7a: Merge "Support LOCAL_INIT_RC."
* commit '7e3ba1b7a735d413f21d2133d53950a580cab0b9':
  Support LOCAL_INIT_RC.
2015-08-20 21:43:33 +00:00
Ying Wang
7e3ba1b7a7 am 8a3241e3: am 11a38e7a: Merge "Support LOCAL_INIT_RC."
* commit '8a3241e39ad541666aeff291b088e7277b5519ca':
  Support LOCAL_INIT_RC.
2015-08-20 21:00:14 +00:00
Ying Wang
4270d91bbe am 8a3241e3: am 11a38e7a: Merge "Support LOCAL_INIT_RC."
* commit '8a3241e39ad541666aeff291b088e7277b5519ca':
  Support LOCAL_INIT_RC.
2015-08-20 21:00:07 +00:00
Ying Wang
8a3241e39a am 11a38e7a: Merge "Support LOCAL_INIT_RC."
* commit '11a38e7a9164bc3268344ce716c4bd12b08cb05c':
  Support LOCAL_INIT_RC.
2015-08-20 20:53:32 +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
Christopher Wiley
a690e0c85a resolved conflicts for merge of 3b27c374 to master
Change-Id: I8c356fe2f8c3e7ea6d4299d59b2f384cd2edff3e
2015-08-19 15:37:33 -07:00
Christopher Wiley
9c49f0affa am 688b4a3d: am 4d2b79f9: Merge "Generate DBus proxies and adaptors separately"
* commit '688b4a3db72b58e8908ecdb24e6c4d64a44fdbc6':
  Generate DBus proxies and adaptors separately
2015-08-19 22:31:03 +00:00
Christopher Wiley
3b27c3743e am 688b4a3d: am 4d2b79f9: Merge "Generate DBus proxies and adaptors separately"
* commit '688b4a3db72b58e8908ecdb24e6c4d64a44fdbc6':
  Generate DBus proxies and adaptors separately
2015-08-19 22:20:23 +00:00
Christopher Wiley
688b4a3db7 am 4d2b79f9: Merge "Generate DBus proxies and adaptors separately"
* commit '4d2b79f99ef34a504fe9f7e362a861d7ddee5659':
  Generate DBus proxies and adaptors separately
2015-08-19 18:37:48 +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
Ying Wang
6c4176e2d0 am 8b4d1432: am cd7dfdb4: Merge "Cleanups."
* commit '8b4d1432395733db45e2dfaeee24fe44d3c49bbe':
  Cleanups.
2015-07-23 02:06:39 +00:00
Yohann Roussel
23f78643b9 Clean call-jack and its callers
This is possible now that we have the new Jack server.
Also fix dependency from dex/jack target to jack script
instead of jack.jar.

(cherry picked from commit 5e50b34221)

Change-Id: I8e7aa5087ba8d73cc93140ddfca8f4ab2f505175
2015-07-22 15:22:22 +00:00
Ying Wang
9e612d6d7c am 960424bc: am 8b4d1432: am cd7dfdb4: Merge "Cleanups."
* commit '960424bc31ae8072c300681c40bfeb1035e091d1':
  Cleanups.
2015-07-22 00:26:18 +00:00
Ying Wang
960424bc31 am 8b4d1432: am cd7dfdb4: Merge "Cleanups."
* commit '8b4d1432395733db45e2dfaeee24fe44d3c49bbe':
  Cleanups.
2015-07-22 00:12:18 +00:00
Ying Wang
8b4d143239 am cd7dfdb4: Merge "Cleanups."
* commit 'cd7dfdb4bf3f7d431d2a37908c550a83a282bf22':
  Cleanups.
2015-07-21 23:57:42 +00:00
Ying Wang
bbd4755647 Cleanups.
- Deleted unused functions in definitions.mk.
- lint is never fully functional in the platform source tree.
- Retire LOCAL_DIST_BUNDLED_BINARIES: now the build system/framework
  supports JNI embedded in apk.

Change-Id: I6314cb20d1544c704ccbc4c1f9cccb9c54fb5a51
2015-07-21 16:03:19 -07:00
Yohann Roussel
b3b6348921 Revert "Clean call-jack and its callers"
This reverts commit 4c1fc77c2e.

Change-Id: I4f5e3ec1e6fea66f315a9411db17de257817dcc9
2015-07-21 16:45:51 +00:00
Yohann Roussel
4c1fc77c2e Clean call-jack and its callers
This is possible now that we have the new Jack server.
Also fix dependency from dex/jack target to jack script
instead of jack.jar.

(cherry picked from commit 5e50b34221)

Change-Id: I5dce864624e97c27441a5ee7f8c3cd582613390e
2015-07-21 00:22:45 +02:00
Ying Wang
5adfc3eb8b Add droiddoc flag LOCAL_DROIDDOC_STUB_OUT_DIR
When calling droiddoc to generate stubs, if you use
LOCAL_DROIDDOC_STUB_OUT_DIR (instead of "-stubs" to
LOCAL_DROIDDOC_LOCAL_DROIDDOC_OPTIONS), the build system gets the chance
to clean up the stub out directory before calling doclava.

Bug: 22534021
Change-Id: Icb0a73eb51bfb1c1ecd88217ebcd39c27df1de29
2015-07-16 14:23:53 -07:00
Ying Wang
ff2c91611f am 1f59fcb2: am 8f908ade: am 2e26f896: Merge "Simplify LOCAL_NO_CRT."
* commit '1f59fcb23d5f126ce366ca540c9f3611ef77b37b':
  Simplify LOCAL_NO_CRT.
2015-07-05 18:08:38 +00:00
Stephen Hines
7a021815b4 am 8e75fb2a: am fc493003: am b2275868: Merge "Add LOCAL_NO_LIBGCC."
* commit '8e75fb2acb64c706fa5703e69778bc0ce78c9b3f':
  Add LOCAL_NO_LIBGCC.
2015-07-05 18:08:35 +00:00
Yohann Roussel
5863a7cf63 Revert "Clean call-jack and its callers"
This reverts commit 5e50b34221.

Change-Id: Ibf76cc454994c7ad84128ac923d39794d46a04ec
2015-07-04 12:11:09 +00:00
Ying Wang
1f59fcb23d am 8f908ade: am 2e26f896: Merge "Simplify LOCAL_NO_CRT."
* commit '8f908ade58fd21d5bb27b7a42f8f07553c237df6':
  Simplify LOCAL_NO_CRT.
2015-07-04 02:58:23 +00:00
Stephen Hines
8e75fb2acb am fc493003: am b2275868: Merge "Add LOCAL_NO_LIBGCC."
* commit 'fc4930034fc2694decc264ba2d217ab60e50d182':
  Add LOCAL_NO_LIBGCC.
2015-07-04 02:58:18 +00:00
Yohann Roussel
5e50b34221 Clean call-jack and its callers
This is possible now that we have the new Jack server.
Also fix dependency from dex/jack target to jack script
instead of jack.jar.

Change-Id: I28b5f7176747853ef707b8d4055017bf60296641
2015-07-03 11:58:38 +02:00
Ying Wang
8f908ade58 am 2e26f896: Merge "Simplify LOCAL_NO_CRT."
* commit '2e26f896a65563f750f2d459d13cc8edfa705d95':
  Simplify LOCAL_NO_CRT.
2015-07-02 23:06:54 +00:00
Ying Wang
491fca9809 Simplify LOCAL_NO_CRT.
Change-Id: If2486e4861071df6b225fe7f387530a38f554484
2015-07-02 15:58:34 -07:00
Stephen Hines
fc4930034f am b2275868: Merge "Add LOCAL_NO_LIBGCC."
* commit 'b2275868e15caef2a04f0530749cc06415ef10f6':
  Add LOCAL_NO_LIBGCC.
2015-07-02 18:45:45 +00:00
Ying Wang
75011b2003 Add LOCAL_NO_LIBGCC.
This can be used to compile independent libraries without the need for
libgcc.a.

Change-Id: I924200995569d9a978ddbaa6ec321d80734f1374
2015-07-02 11:05:27 -07:00
Dan Albert
235a7f7ee7 am 6f3527fe: am cf66a791: am 4fbb83dd: Merge "Add support for LOCAL_SANITIZE := integer."
* commit '6f3527fe604b635e22243905cbe6cd1473374f11':
  Add support for `LOCAL_SANITIZE := integer`.
2015-06-19 18:29:07 +00:00
Dan Albert
6f3527fe60 am cf66a791: am 4fbb83dd: Merge "Add support for LOCAL_SANITIZE := integer."
* commit 'cf66a79130a7382a583f20197f42436a5c1d4095':
  Add support for `LOCAL_SANITIZE := integer`.
2015-06-19 18:16:24 +00:00
Dan Albert
cf66a79130 am 4fbb83dd: Merge "Add support for LOCAL_SANITIZE := integer."
* commit '4fbb83dd3b69729fe08e4a18dd13ca536ae7376f':
  Add support for `LOCAL_SANITIZE := integer`.
2015-06-19 18:03:12 +00:00
Dan Albert
b8a87c2241 am 630e81ab: am 9b187b35: am 20f4a364: Merge "Cleanup unused clear_vars.mk entry."
* commit '630e81ab99d546d7f99228bca6e21b1a4f9749e0':
  Cleanup unused clear_vars.mk entry.
2015-06-19 17:57:06 +00:00
Dan Albert
630e81ab99 am 9b187b35: am 20f4a364: Merge "Cleanup unused clear_vars.mk entry."
* commit '9b187b35f32f427dbd6af21614dfefa03177b594':
  Cleanup unused clear_vars.mk entry.
2015-06-19 17:45:07 +00:00
Dan Albert
9b187b35f3 am 20f4a364: Merge "Cleanup unused clear_vars.mk entry."
* commit '20f4a364a83d9a3906d3cf8b866d00437f8ff2d4':
  Cleanup unused clear_vars.mk entry.
2015-06-19 17:35:15 +00:00
Dan Albert
abf4bc916a Add support for LOCAL_SANITIZE := integer.
This also does a bit of cleanup in config_sanitizers.mk. The result is
that `LOCAL_SANITIZE := <any arbitrary ubsan group>` should function
fine for both host and target.

This is a superset of LOCAL_DETECT_INTEGER_OVERFLOWS, so remove that.
This also checks integer division by zero.  It's supposed to cover
shifting undefined behaviors as well, but apparently it does not
(though `LOCAL_SANITIZE := shift` works fine).

Change-Id: I4ac99eafa6920a3f8cb82af37ce56ff0fdb95223
2015-06-19 10:28:06 -07:00
Dan Albert
1578c487c9 Cleanup unused clear_vars.mk entry.
Change-Id: Ibd7b87d1364a60289609a267a287c4afa1d5e5cb
2015-06-19 10:24:07 -07:00
Nick Kralevich
fd9b5a6e5a am ad48a465: am d400f774: am dcac4582: Merge "Add support for LOCAL_DETECT_INTEGER_OVERFLOWS"
* commit 'ad48a4655a09811cb43d261f3f101fadfe58f695':
  Add support for LOCAL_DETECT_INTEGER_OVERFLOWS
2015-06-15 22:42:04 +00:00
Nick Kralevich
ad48a4655a am d400f774: am dcac4582: Merge "Add support for LOCAL_DETECT_INTEGER_OVERFLOWS"
* commit 'd400f7740d1f8105c5d4d5fdb355f08808c729a5':
  Add support for LOCAL_DETECT_INTEGER_OVERFLOWS
2015-06-15 22:17:35 +00:00
Nick Kralevich
d400f7740d am dcac4582: Merge "Add support for LOCAL_DETECT_INTEGER_OVERFLOWS"
* commit 'dcac45820e4ce7faad4dbfd187f8b788964c9981':
  Add support for LOCAL_DETECT_INTEGER_OVERFLOWS
2015-06-15 22:04:47 +00:00
Nick Kralevich
99d92506ac Add support for LOCAL_DETECT_INTEGER_OVERFLOWS
Add build system support for LOCAL_DETECT_INTEGER_OVERFLOWS. When enabled,
an attempt to perform an integer arithmetic operation which overflows
will result in a call to abort(). This is intended for security
sensitive code, where integer overflow operations are not expected
nor desirable.

Two classes of underflows/overflows are detected and blocked:

1) Signed integer underflow/overflow.
2) Unsigned integer underflow/overflows.

Signed integer overflows are undefined behavior, according to the
C standard. Unsigned integer overflows are defined behavior, but
still undesirable in security sensitive code.

Only clang is supported today. gcc has -ftrapv for handling signed
integer overflow, but it's widely considered broken
(https://gcc.gnu.org/bugzilla/show_bug.cgi?id=35412) and we're
deliberately avoiding it's use here.

Change-Id: Ib4918dc84e37e83d4205e5035544545d91671e5f
Vaguely-Related-Bug: 11859726
2015-06-15 14:52:09 -07:00
Dimitry Ivanov
a66f8bae07 am 9c836723: am 72bced8a: Merge changes from topic \'prebuilt-open-from-apk\' into mnc-dev
* commit '9c836723b784a344442d4646fc849470b8fcd515':
  Uncompress .so files before signing the apk.
  Don't extract jni from prebuilt apks.
2015-06-04 20:33:25 +00:00
Dimitry Ivanov
9c836723b7 am 72bced8a: Merge changes from topic \'prebuilt-open-from-apk\' into mnc-dev
* commit '72bced8a758a3a8427768d97e6d763f6a706d2b1':
  Uncompress .so files before signing the apk.
  Don't extract jni from prebuilt apks.
2015-06-04 20:19:49 +00:00
Ying Wang
1624361d84 Add support for LOCAL_COMPATIBILITY_SUITE
A module can specify itself to be a Compatibility Suite module with:
LOCAL_COMPATIBILITY_SUITE := <cts-name>
<cts-name> can be "cts" or any other cts name supported by the
build system.

The cts name's config.mk must define global variable
COMPATIBILITY_TESTCASES_OUT_<cts-name> to point to the testcase
output directory.
This change copies the module's built file, as well as the module's
AndroidTest.xml, to the testcase output directory.
The build system collects all the testcase files in a global variable
COMPATIBILITY.<cts-name>.FILES, which you can reference in a build
task that builds the suite's zip package.
Also copy over the test case files if user runs mm/mmm/etc.

Change-Id: Ica0dbc4f193db7de7d395b9c686733bdac41f566
2015-06-03 16:21:12 -07:00