Commit Graph

32534 Commits

Author SHA1 Message Date
Vikram Dattu
8be44674a1 otatools: added missing shared library for make_ext4fs
Added the missing shared library libpcre2.so for make_ext4fs
in the otatools.zip.
Standalone signing the images with otatools zip is not working
due to missing library for make_ext4fs.

Test: tools/releasetools/sign_target_files_apks
    -p <extracted ota-tools.zip folder>
    --extra_signapk_args=-f /etc/opt/cert_data.dat
    -v
    --replace_verity_private_key ~/build/target/product/security/verity
    --replace_verity_public_key ~/build/target/product/security/verity.x509.pem
    -k <key maping>
    <input target files zip>
    <output target files zip>

Change-Id: I4fc71a1c710f3075bb3bdb90d915538526004ee6
2016-12-20 13:53:34 +01:00
Hiroshi Yamauchi
64594c4f53 Add ART_USE_READ_BARRIER to product variables.
Bug: 33492005
Test: top-level build for angler.
Change-Id: I12aa2e18487c16423223f110b6dfb0d6dff1e7e8
2016-12-19 16:25:00 -08:00
Tao Bao
a10cd259fc Merge "blockimgdiff.py: Add a test case for ReviseStashSize()."
am: f967849693

Change-Id: Ibb1ffeb5c5e13578b4669c5525d270c4f3b7175d
2016-12-19 21:22:45 +00:00
Tao Bao
f967849693 Merge "blockimgdiff.py: Add a test case for ReviseStashSize()." 2016-12-19 21:15:18 +00:00
Tao Bao
304ee27e88 blockimgdiff.py: Add a test case for ReviseStashSize().
Bug: 33687949
Test: python -m unittest test_blockimgdiff
Change-Id: I31e42648d2c0e60b941908c098ce5ccc967861ca
2016-12-19 11:17:12 -08:00
Richard Uhler
c30981e2d0 Remove option for non-pic dex preopt.
Test: make checkbuild, aosp_bullhead-userdebug boots.
Bug: 33192586

Change-Id: I4dd179fac33d777fb10cc85a99ff68c3b0d0e03d
2016-12-19 09:52:25 +00:00
Elliott Hughes
2d7c86dfea Revert "Revert "Merge changes from topic 'fsconfig-2'""
This reverts commit fad4b4b715.

Incorporating the following fixes:

1.

fsconfig: fix fs_config_* build for discovered headers

When android_file system_config.h is picked up from the device
directory, neither TARGET_FS_CONFIG_GEN or TARGET_ANDROID_FILESYSTEM_CONFIG_H
are specified. Thus, the build is not generating the required fs_config_files
and fs_config_dirs.

Test: Ensure that make fs_config_files works, and produces the same output as before
      Build the system image and mount it as a loop back and dump the file system
      capabilities with getcap. Verify that output to the supplied
      android_file system_config.h

From the loopback of the system.img mount, from CWD system/bin:
$ getcap *
cnss-daemon = cap_net_bind_service+ep
hostapd = cap_net_admin,cap_net_raw+ep
imsdatadaemon = cap_net_bind_service+ep
ims_rtp_daemon = cap_net_bind_service+ep
logd = cap_setgid,cap_audit_control,cap_syslog+ep
mm-qcamera-daemon = cap_sys_nice+ep
pm-service = cap_net_bind_service+ep
run-as = cap_setgid,cap_setuid+ep
surfaceflinger = cap_sys_nice+ep
webview_zygote32 = cap_setgid,cap_setuid,cap_setpcap+ep
webview_zygote64 = cap_setgid,cap_setuid,cap_setpcap+ep

Compared to the android_filesystem_config.h:
    { 00700, AID_CAMERA,    AID_SHELL,     (1ULL << CAP_SYS_NICE), "system/bin/mm-qcamera-daemon" },
    { 00755, AID_SYSTEM,    AID_SYSTEM,    (1ULL << CAP_NET_BIND_SERVICE), "system/bin/pm-service" },
    { 00755, AID_SYSTEM,    AID_SYSTEM,    (1ULL << CAP_NET_BIND_SERVICE), "system/bin/imsdatadaemon" },
    { 00755, AID_SYSTEM,    AID_RADIO,     (1ULL << CAP_NET_BIND_SERVICE), "system/bin/ims_rtp_daemon" },
    { 00755, AID_SYSTEM,    AID_SYSTEM,    (1ULL << CAP_NET_BIND_SERVICE), "system/bin/cnss-daemon"},

2.

fsconfig: fix error message for duplicate AID

Fixes:
    raise ValueError('Duplicate aid value "%u" for %s' % value,
TypeError: %u format: a number is required, not str

and

    raise ValueError('Duplicate aid value "%s" for %s' % value,
TypeError: not enough arguments for format string

3.

fsconfig: add test for duplicate ranges

Add a test for duplicate range detection.

4.

fsconfig: skip AID_APP, AID_USER and all ranges

Do not output AID_APP, AID_USER and ranges. A range
is defined as ending with AID_ and ending in _START or
_END.

5.

fsconfig: test for skip AID_APP, AID_USER and all ranges

Test against AIDs that caused the bionic tests to fail.

Change-Id: I95569a9ccc83bd3231f8a6f395532cc2de316bd2
Signed-off-by: William Roberts <william.c.roberts@intel.com>
2016-12-18 10:55:35 -08:00
Daniel Cashman
5e8be7b822 Merge "Revert "Add build dependencies for split sepolicy files.""
am: cbdc0bd096

Change-Id: Ie73ea2b943a153422e0373ef291f7306747e5420
2016-12-17 01:08:18 +00:00
Daniel Cashman
cbdc0bd096 Merge "Revert "Add build dependencies for split sepolicy files."" 2016-12-17 00:59:43 +00:00
Daniel Cashman
df1e2102c6 Revert "Add build dependencies for split sepolicy files."
This reverts commit 086189145c.

Change-Id: Idfd210d1f16eefcedda6154b0361611f53c5158f
2016-12-17 00:53:52 +00:00
dcashman
bc1832f381 Merge "Add build dependencies for split sepolicy files."
am: 298f9b5925

Change-Id: I8e8ef53b98d4341deab6f5ddb54cac6f30329e9c
2016-12-17 00:23:38 +00:00
Treehugger Robot
298f9b5925 Merge "Add build dependencies for split sepolicy files." 2016-12-17 00:17:13 +00:00
Tao Bao
bf32e87669 Merge "releasetools: Fix the computation in ReviseStashSize()."
am: 9cc98767ad

Change-Id: I2fbadc053c017b3a52cc2856f9b86511b8cb6a44
2016-12-17 00:07:34 +00:00
Tao Bao
9cc98767ad Merge "releasetools: Fix the computation in ReviseStashSize()." 2016-12-16 23:57:40 +00:00
dcashman
086189145c Add build dependencies for split sepolicy files.
Add build targets for split sepolicy files so they'll appear in the root dir for
on-device compilation.  nonplat_sepolicy will eventually be removed as it should
be provided by a different partition.  Also replace sepolicy.recovery with the
appropriate split components.

Bug: 31363362
Test: Policy builds on-device and boots.
Change-Id: I017dabe6940c3cd20de6c00bb5253274d5a9269b
2016-12-16 14:01:29 -08:00
Joe LaPenna
f4251ee777 Merge "Add default NetworkRecommendation to core.mk"
am: 95f616b960

Change-Id: Ice21caa64e01e15911d9f5979cd0db345e5686f1
2016-12-16 20:35:04 +00:00
Treehugger Robot
95f616b960 Merge "Add default NetworkRecommendation to core.mk" 2016-12-16 20:23:48 +00:00
Tao Bao
e27acfdc41 releasetools: Fix the computation in ReviseStashSize().
We compute the max stashed_blocks in ReviseStashSize(), prior to calling
WriteTransfers(), to avoid running out of space due to stashing.

There is a bug when computing the to-be-freed stashed blocks, where we
wrongly free the space _before_ executing the transfer command. This leads
to a script failure where the max stash size violates the max allowed
size in WriteTransfers().

Note that this bug doesn't affect already generated packages. It's only
an underestimate in ReviseStashSize(). The check in WriteTransfers() has
been correct to ensure the max stash size.

Bug: 33687949
Test: Successfully generated incremental OTA which failed previously.
Change-Id: I4f4f043c6f521fce81ca5286e6156f22d99bf7f7
2016-12-16 11:26:05 -08:00
Joe LaPenna
fa77432e6f Add default NetworkRecommendation to core.mk
This makes the apk avaiable on all devices and can be overridden on a
per-product basis using LOCAL_OVERRIDES_PACKAGES.

BUG: 33224286
Test: Verified with lunch aosp_bullhead-userdebug; make

Change-Id: Ib345193caa4431b6405294bd8759d93349335814
2016-12-16 10:48:47 -08:00
Alex Klyubin
2c70770e93 Merge "aapt no longer needed for signing APKs"
am: 3cfff7386f

Change-Id: I95e90f0c4e31fe79bb72a302bec2d89885959533
2016-12-16 17:30:23 +00:00
Alex Klyubin
24b383a770 Merge "Remove unused get-package-min-sdk-version-int"
am: 5a1ba84c30

Change-Id: Id5b5c1a36f6fe6ef85f9cee12a7e49dacd416801
2016-12-16 17:30:09 +00:00
Alex Klyubin
3cfff7386f Merge "aapt no longer needed for signing APKs" 2016-12-16 17:21:13 +00:00
Alex Klyubin
5a1ba84c30 Merge "Remove unused get-package-min-sdk-version-int" 2016-12-16 17:20:23 +00:00
Vijay Venkatraman
fe371b310f Merge "Revert "Extends VNDK support in Make by setting LOCAL_USE_VNDK for modules going into vendor partition, except when they already have LOCAL_SDK_VERSION set.""
am: e4be608d2f

Change-Id: I236dd4c28d4bbe65fc51fb3fbd599a3a23129b14
2016-12-16 02:17:48 +00:00
Vijay Venkatraman
e9709b4575 Revert "Extends VNDK support in Make by setting LOCAL_USE_VNDK for modules going into vendor partition, except when they already have LOCAL_SDK_VERSION set."
am: 823172e209

Change-Id: If6249d3b311089ea342fb873288ad38c12bc53d1
2016-12-16 02:17:47 +00:00
Vijay Venkatraman
e4be608d2f Merge "Revert "Extends VNDK support in Make by setting LOCAL_USE_VNDK for modules going into vendor partition, except when they already have LOCAL_SDK_VERSION set."" 2016-12-16 02:11:12 +00:00
Vijay Venkatraman
823172e209 Revert "Extends VNDK support in Make by setting LOCAL_USE_VNDK for modules going into vendor partition, except when they already have LOCAL_SDK_VERSION set."
This reverts commit 2b6c204c73.

Change-Id: I60a042f2ed0c767ec3a45c31ee1b99d43891efaa
2016-12-16 02:08:18 +00:00
Alex Klyubin
664cc31fd8 Remove unused get-package-min-sdk-version-int
The only user of get-package-min-sdk-version-int was signapk. signapk
no longer needs to be provided with the APK's minSdkVersion though.

(cherry picked from commit e185da21ca)
Test: make clean && make

Change-Id: I6867a004aec0f3752cbbc99cc30e02ca5404b3c4
2016-12-15 16:37:37 -08:00
Alex Klyubin
1b391c002d aapt no longer needed for signing APKs
signapk now auto-detects the APK's minSdkVersion, removing the need to
run aapt dump badging during APK signing.

Test: make clean && make
Change-Id: Ifc74292a9900443d053e437b50b540c8d0b33dbd
2016-12-15 16:37:21 -08:00
Vijay Venkatraman
fe9ba5edf4 Merge "Extends VNDK support in Make by setting LOCAL_USE_VNDK for modules going into vendor partition, except when they already have LOCAL_SDK_VERSION set."
am: b777f169f8

Change-Id: I7d0c58f2c1be9084b8a78a7fa32c9dab6eb31756
2016-12-15 21:37:30 +00:00
Vijay Venkatraman
23da9097fe Extends VNDK support in Make by setting LOCAL_USE_VNDK for modules going into vendor partition, except when they already have LOCAL_SDK_VERSION set.
am: 2b6c204c73

Change-Id: Iea702c06134f40b312c795ce13d41fa94bc62e15
2016-12-15 21:37:29 +00:00
Vijay Venkatraman
b777f169f8 Merge "Extends VNDK support in Make by setting LOCAL_USE_VNDK for modules going into vendor partition, except when they already have LOCAL_SDK_VERSION set." 2016-12-15 21:26:16 +00:00
dcashman
63a91e9ee0 Merge "Split mac_permissions.xml into plat and non-plat components."
am: b8888197c6

Change-Id: Id0785ec8105d31cb8dd21780be3552588c4ce9e8
2016-12-15 20:27:32 +00:00
dcashman
f976eae6f3 Split mac_permissions.xml into plat and non-plat components.
am: 15171f641e

Change-Id: Ic2ad780d79f58d8fcffffcae7e3aaefda5b4be4f
2016-12-15 20:26:40 +00:00
Treehugger Robot
b8888197c6 Merge "Split mac_permissions.xml into plat and non-plat components." 2016-12-15 20:13:29 +00:00
dcashman
15171f641e Split mac_permissions.xml into plat and non-plat components.
Bug: 31363362
Test: Bullhead and Sailfish both build and boot w/out new denials.
Change-Id: Id7e29ec09510741c4e925231401a6de81704fbf0
2016-12-15 10:04:25 -08:00
Dan Willemsen
da8f49522d Merge "Remove variables exported by Soong"
am: f61205d5c7

Change-Id: I2140a80261c0062e220656e6017b3142d486176f
2016-12-15 07:27:36 +00:00
Treehugger Robot
f61205d5c7 Merge "Remove variables exported by Soong" 2016-12-15 07:19:03 +00:00
Dan Willemsen
c29cf6efb6 Merge "Don't clean generated java sources when AIDL list changes"
am: e9c4079e91

Change-Id: I854de56628e16c12a771f18423274e5409ee374b
2016-12-15 07:13:05 +00:00
Treehugger Robot
e9c4079e91 Merge "Don't clean generated java sources when AIDL list changes" 2016-12-15 07:01:13 +00:00
Dan Willemsen
3c6bba0af0 Don't clean generated java sources when AIDL list changes
AIDL doesn't generate into the intermediate src directory, we pass exact
aidl->java files to the compiler. So there is no need to clean the
intermediate src directory when the aidl file list changes for a module.

Test: None, just code inspection
Change-Id: I01feff7cc399ac5b88b83333a1ac86928d0a81e6
2016-12-14 19:53:54 -08:00
Dan Willemsen
bfedf05812 Merge "Identify non-local EXPORT_C_INCLUDE_DIRS in soong_to_convert"
am: d3cc4950f8

Change-Id: Ie22b04f74b035bfbe1985dbb1f5bc82e43d50e4a
2016-12-15 00:38:40 +00:00
Dan Willemsen
d3cc4950f8 Merge "Identify non-local EXPORT_C_INCLUDE_DIRS in soong_to_convert" 2016-12-15 00:30:04 +00:00
Dan Willemsen
56c6a9d1ff Remove variables exported by Soong
LLVM_RELEASE_VERSION is unused from envsetup.sh and during product
config loading.  LLVM_PREBUILTS_VERSION is still used in envsetup.sh, so
needs to stay.

Delay reading core/clang/config.mk until after Soong's variables are
read so that we don't need a copy of LLVM_PREBUILTS_BASE.

Test: Compare build-aosp_flounder.ninja
Change-Id: I85b5836a2230838c8f3766fb19c6108fc5c9ca50
2016-12-14 16:27:08 -08:00
Alex Klyubin
1f5e43cb6f Merge "Faster auto-detection of APK's minSdkVersion"
am: 620686f3c6

Change-Id: Idc1d55388577032f009027170fcf69e72666b793
2016-12-14 23:48:06 +00:00
Alex Klyubin
620686f3c6 Merge "Faster auto-detection of APK's minSdkVersion" 2016-12-14 23:42:13 +00:00
Tao Bao
bf9e4aa53f Merge "releasetools: Add prefix when dumping fingerprints."
am: a282ceeb73

Change-Id: I233432e2a64cc52409129a8ef628461f31e700c9
2016-12-14 21:00:25 +00:00
Alex Klyubin
9b75e272b6 Faster auto-detection of APK's minSdkVersion
Prior to this change, when signing APKs, the build system invoked
'aapt dump badging' on each APK, to detect the value to pass into
signapk as --min-sdk-version. Now that signapk uses the apksig
library, it can auto-detect that value on its own, thus avoiding the
need to invoke 'aapt dump badging' and thus speeding up the build
process.

The semantics of signapk's --min-sdk-version flag is changed by this
commit from having the default value of 0 to having the default value
of "auto-detect from APK".

P.S. The get-package-min-sdk-version-int is not removed from
core/definitions.mk in this commnit, because this function is used in
another project's .mk file and thus that .mk file needs to be modified
first.

Test: rm -Rf out/ && make
Change-Id: I0972fcf0abbde9cbf6794e6c05c743c77c8a78f9
2016-12-14 12:53:44 -08:00
Treehugger Robot
a282ceeb73 Merge "releasetools: Add prefix when dumping fingerprints." 2016-12-14 20:53:02 +00:00
Tao Bao
f9023856ad releasetools: Add prefix when dumping fingerprints.
We used to dump "Source: <fingerprint>" in update logs. The "Source: "
prefix was unintentionally dropped out.

Test: Check the generated incremental BBOTA script.
Change-Id: I4de62333aa38e3fb09a76df0e769b62af48e0313
2016-12-14 11:53:38 -08:00