Colin Cross
cf680bc55e
Merge changes I47b9def5,I16661701,I194aeeb8 am: 9d0940c7a7
...
am: 3eef5574ae
2018-05-24 18:42:38 -07:00
Colin Cross
3eef5574ae
Merge changes I47b9def5,I16661701,I194aeeb8
...
am: 9d0940c7a7
2018-05-24 18:39:41 -07:00
Colin Cross
9d0940c7a7
Merge changes I47b9def5,I16661701,I194aeeb8
...
* changes:
Export manifest to Make
Add support for android_test modules
Reduce boilerplate around bpfix passes
2018-05-25 01:34:11 +00:00
Dan Albert
e6ab4f9657
Merge changes from topic "preprocessed_ndk_headers" am: 5ae3652d99
...
am: 7435738d53
2018-05-24 17:08:48 -07:00
Dan Albert
7435738d53
Merge changes from topic "preprocessed_ndk_headers"
...
am: 5ae3652d99
2018-05-24 17:01:40 -07:00
Treehugger Robot
5ae3652d99
Merge changes from topic "preprocessed_ndk_headers"
...
* changes:
Rename preprocessed_ndk_headers to versioned_ndk_headers.
Add exclude_srcs property to ndk_headers modules.
Fix typo. Properies -> Properties.
2018-05-24 23:47:57 +00:00
Nan Zhang
bfc040e779
Merge "Allow "-" to be part of Python file names" am: c039ab084d
...
am: 123f82f90b
2018-05-24 15:51:17 -07:00
Nan Zhang
b68b4f828f
Merge "Revert "Revert "Add libc++.so as install dependencies for hermetic Python.""" am: 3332fdef7c
...
am: c0b7bd2882
2018-05-24 15:50:55 -07:00
Colin Cross
515e486a05
Merge "Support platform_apis property" am: 47ec6df851
...
am: 31aac9ec9f
2018-05-24 15:49:59 -07:00
Colin Cross
bb618cfd87
Merge "Fix optimize.proguard_flags_files typo" am: 8f09cd34b6
...
am: 6df0335b2a
2018-05-24 15:49:23 -07:00
Colin Cross
10f7c4a268
Export manifest to Make
...
I5d439353d46ba6659ec8d16967693d2b9e62ab5a will need the manifests
from android libraries to merge into modules that reference them
with LOCAL_STATIC_ANDROID_LIBRARIES.
Bug: 3434784
Test: m checkbuild
Change-Id: I47b9def5b9c2ecc423550eb8a988cce96038a81e
2018-05-24 15:24:12 -07:00
Dan Albert
97f9c963ad
Rename preprocessed_ndk_headers to versioned_ndk_headers.
...
The current rule runs a specific preprocessor over the source files,
and I'm adding support for generic preprocessed headers in a follow
up patch.
Test: make checkbuild
Bug: None
Change-Id: I1f3193cd595f151309e6321e1b41d8d16085379d
2018-05-24 15:12:51 -07:00
Dan Albert
19ff8b4662
Add exclude_srcs property to ndk_headers modules.
...
Test: make checkbuild
Bug: None
Change-Id: I2778c1140ab50abc0f7dee66da35ebacef77ea72
2018-05-24 15:12:26 -07:00
Dan Albert
7122205a5a
Fix typo. Properies -> Properties.
...
Test: make checkbuild
Bug: None
Change-Id: I0b5e3dd44f507207f2de90e922dd7016cffce118
2018-05-24 15:12:20 -07:00
Colin Cross
ae5caf554c
Add support for android_test modules
...
android_test module are APKs that can be run as tests, either
as standalone unit tests or as instrumentation tests for another
APK.
Test: m checkbuild
Change-Id: I16661701637e4048fd99442029c3e195ebf373a4
2018-05-24 14:53:58 -07:00
Colin Cross
e467f44f9b
Reduce boilerplate around bpfix passes
...
Make it easier to add bpfix passes by putting them in a single
list.
Test: bpfix_test.go
Change-Id: I194aeeb88457800545d58aceb5d1616c6752274a
2018-05-24 14:53:58 -07:00
Vishwath Mohan
9b87f812ea
Disable CFI for vendor variants of VNDK libraries
...
am: 7589c82eec
2018-05-24 14:43:32 -07:00
Nan Zhang
123f82f90b
Merge "Allow "-" to be part of Python file names"
...
am: c039ab084d
2018-05-24 13:21:11 -07:00
Nan Zhang
c0b7bd2882
Merge "Revert "Revert "Add libc++.so as install dependencies for hermetic Python."""
...
am: 3332fdef7c
2018-05-24 13:20:57 -07:00
Colin Cross
31aac9ec9f
Merge "Support platform_apis property"
...
am: 47ec6df851
2018-05-24 13:20:36 -07:00
Colin Cross
6df0335b2a
Merge "Fix optimize.proguard_flags_files typo"
...
am: 8f09cd34b6
2018-05-24 13:20:10 -07:00
Treehugger Robot
c039ab084d
Merge "Allow "-" to be part of Python file names"
2018-05-24 17:34:22 +00:00
Treehugger Robot
3332fdef7c
Merge "Revert "Revert "Add libc++.so as install dependencies for hermetic Python."""
2018-05-24 17:26:07 +00:00
Colin Cross
47ec6df851
Merge "Support platform_apis property"
2018-05-24 17:18:43 +00:00
Colin Cross
8f09cd34b6
Merge "Fix optimize.proguard_flags_files typo"
2018-05-24 17:18:31 +00:00
Vishwath Mohan
7589c82eec
Disable CFI for vendor variants of VNDK libraries
...
Enabling CFI changes the VNDK ABI from the frozen snapshot, so the
only solution for now is to temporarily disable CFI on all vendor
variants for the sake of compatibility.
Bug: 66301104
Test: ABI is consistent.
Change-Id: Ie7dca41e0f647808b08adede09a30f3c746e6bda
2018-05-23 23:39:38 -07:00
Nan Zhang
ccf636e36a
Revert "Revert "Add libc++.so as install dependencies for hermetic Python.""
...
This reverts commit bfb0aed2dd
2018-05-23 18:09:34 -07:00
Nan Zhang
1a479b6ecd
Allow "-" to be part of Python file names
...
Test: m -j py-setuptools
Bug: b/79751992
Change-Id: I4cd0cf8671a9bb912a8ba819265274ab0c9e0074
2018-05-23 15:15:39 -07:00
Vishwath Mohan
37b980968d
[automerger skipped] Merge "Allow abi diffs sanitized variants of vndk libraries on production devices." into pi-dev
...
am: 165e01b744
2018-05-23 14:12:49 -07:00
Jayant Chowdhary
bc1a2488bc
[automerger skipped] Allow abi diffs sanitized variants of vndk libraries on production devices.
...
am: f267f715eb
2018-05-23 14:11:38 -07:00
Nan Zhang
181497fc4e
Merge "Fix Protobuf importing issue for embedded Python" am: 78a01965d0
...
am: 3663b08074
2018-05-23 13:54:25 -07:00
Nan Zhang
3663b08074
Merge "Fix Protobuf importing issue for embedded Python"
...
am: 78a01965d0
2018-05-23 13:42:20 -07:00
Treehugger Robot
78a01965d0
Merge "Fix Protobuf importing issue for embedded Python"
2018-05-23 20:24:42 +00:00
Artem Iglikov
999df914a5
Merge "Revert "Add libc++.so as install dependencies for hermetic Python."" am: a0a7fc16bf
...
am: 52cbf83fb8
2018-05-23 13:08:58 -07:00
Nan Zhang
b2f927a9b2
Merge "Add libc++.so as install dependencies for hermetic Python." am: d0ce8e8aab
...
am: fabe434d56
2018-05-23 12:50:01 -07:00
Artem Iglikov
52cbf83fb8
Merge "Revert "Add libc++.so as install dependencies for hermetic Python.""
...
am: a0a7fc16bf
2018-05-23 11:13:21 -07:00
Vishwath Mohan
165e01b744
Merge "Allow abi diffs sanitized variants of vndk libraries on production devices." into pi-dev
2018-05-23 17:47:38 +00:00
Nan Zhang
fabe434d56
Merge "Add libc++.so as install dependencies for hermetic Python."
...
am: d0ce8e8aab
2018-05-23 10:39:09 -07:00
Artem Iglikov
a0a7fc16bf
Merge "Revert "Add libc++.so as install dependencies for hermetic Python.""
2018-05-23 10:34:07 +00:00
Artem Iglikov
bfb0aed2dd
Revert "Add libc++.so as install dependencies for hermetic Python."
...
This reverts commit ff7d397218
2018-05-23 08:49:38 +00:00
Nan Zhang
f0c4e4339a
Fix Protobuf importing issue for embedded Python
...
As I mentioned in b/79751992 #4 , when launcher loads __main__ as entry point,
the module dict got set using absolute pkg path which
was runfiles.google.protobuf which caused the type checking failed
(expected: google.protobuf for type()). After then, starting with non entrypoint
python files, the importing module dict would be set with from...import...
So remove dir:runfiles/ from zip section so that during entrypoint Python file
importing the proto files using
from...import..., the type checking can be passed.
Bug: b/79751992
Test: m clean && m out/host/linux-x86/bin/perf_proto_stack;
And execute it:
usage: perf_proto_stack [-h] [--syms SYMS] [--json-out JSON_OUT]
[--print-samples] [--skip-kernel-syms]
[--print-pid-histogram] [--print-sym-histogram]
[--print-dso-histogram] [--parallel PARALLEL]
file [file ...]
perf_proto_stack: error: too few arguments
Change-Id: I95a4a9ee95ce7f90d893ea0529c384d7b944abe4
2018-05-23 03:33:36 +00:00
Treehugger Robot
d0ce8e8aab
Merge "Add libc++.so as install dependencies for hermetic Python."
2018-05-23 00:03:13 +00:00
Tri Vo
ec3a768767
Merge "Account for multiple BOARD_PLAT_PUBLIC[PRIVATE]_SEPOLICY_DIR dirs" am: 542d60062f
...
am: 01f63e2954
2018-05-22 16:06:57 -07:00
Tri Vo
01f63e2954
Merge "Account for multiple BOARD_PLAT_PUBLIC[PRIVATE]_SEPOLICY_DIR dirs"
...
am: 542d60062f
2018-05-22 16:02:19 -07:00
Treehugger Robot
542d60062f
Merge "Account for multiple BOARD_PLAT_PUBLIC[PRIVATE]_SEPOLICY_DIR dirs"
2018-05-22 22:50:59 +00:00
Nan Zhang
ff7d397218
Add libc++.so as install dependencies for hermetic Python.
...
Bug: b/80140289
Test: m clean && m test_me
Change-Id: I3acbf1bac3b866b37f9ec69584dc9be7a5ad1d89
2018-05-22 14:18:30 -07:00
Colin Cross
6af2e4980f
Support platform_apis property
...
Add a platform_apis property. The logic to verify it isn't
hooked up yet, but this will allow translating modules to
Soong without losing the annotation.
Test: m checkbuild
Change-Id: I75ff2d7b94247873f5bb1547a9b347a8e73c3191
2018-05-22 14:14:27 -07:00
Colin Cross
96e7f85b51
Fix optimize.proguard_flags_files typo
...
LOCAL_PROGUARD_FLAG_FILES should convert to
optimize.proguard_flags_files, not optimize.proguard_flag_files.
Test: m checkbuild
Change-Id: I1471afc006a2a3892af37d2cb73c51636f05d7f7
2018-05-22 12:51:27 -07:00
Tri Vo
f544fe3db9
Account for multiple BOARD_PLAT_PUBLIC[PRIVATE]_SEPOLICY_DIR dirs
...
After https://android-review.googlesource.com/688488
BOARD_PLAT_PUBLIC[PRIVATE]_SEPOLICY_DIR can now specify multiple
directories.
Bug: n/a
Test: build sepolicy
Change-Id: I838c76736a3f1bd8759e24739cf82fea33a531b4
2018-05-22 09:23:44 -07:00
Colin Cross
f881351d53
Merge "Add bpf module type" into pi-dev
...
am: 683444e40f
2018-05-21 23:28:37 -07:00
