Commit Graph

12780 Commits

Author SHA1 Message Date
Adam Seaton
cfdcc41cd7 Update Security String to 2017-05-05 on nyc-dev
Bug:34137924
2017-03-16 16:36:36 +00:00
Adam Seaton
573e7e75ca Update Security String to 2017-05-01 on nyc-dev
Bug:34137924
2017-03-16 16:31:51 +00:00
Miao Wang
0c386896c9 Merge "Add TARGET_OUT_VENDOR_RENDERSCRIPT_BITCODE definition." am: 3fd80635af am: 45976ab0c9
am: b3ccb7679b

Change-Id: Ia7253e725bf5a410a223eef46eec9befc1952537
2017-03-16 06:54:55 +00:00
Miao Wang
b3ccb7679b Merge "Add TARGET_OUT_VENDOR_RENDERSCRIPT_BITCODE definition." am: 3fd80635af
am: 45976ab0c9

Change-Id: I589c78fe9c4e216edebc59c56042fdfadcae1ffd
2017-03-16 06:52:22 +00:00
Miao Wang
45976ab0c9 Merge "Add TARGET_OUT_VENDOR_RENDERSCRIPT_BITCODE definition."
am: 3fd80635af

Change-Id: Id6c164577684e0ed03e8ff1adf29d4648cf31f6c
2017-03-16 06:49:54 +00:00
Treehugger Robot
3fd80635af Merge "Add TARGET_OUT_VENDOR_RENDERSCRIPT_BITCODE definition." 2017-03-16 06:45:48 +00:00
Jiyong Park
a2a63dd52d Merge "Silence module path warnings for a while" am: d5c3d1366f am: 42fc6363a6
am: 9a28a6443c

Change-Id: Ie6c62ada01dbf6c8659fed8d43b9ab6193a100f0
2017-03-16 05:59:04 +00:00
Jiyong Park
9a28a6443c Merge "Silence module path warnings for a while" am: d5c3d1366f
am: 42fc6363a6

Change-Id: Ic02414fe5f179ea2fa891416635b5b5ff36e84c8
2017-03-16 05:57:33 +00:00
Jiyong Park
42fc6363a6 Merge "Silence module path warnings for a while"
am: d5c3d1366f

Change-Id: I9bc012f72dd347b725c1104c22eb84940966df5c
2017-03-16 05:54:32 +00:00
Adam Lesinski
981de838d4 Add LOCAL_ASSET_DIR support (-A) to aapt2
Although performing the inclusion of assets/ at a later stage is
preferable, (since aapt just copies the files) do the easy thing and
support what aapt did. In the future perhaps we can zip up the
assets/ directories when also merging in the classes.dex.

Bug: 35461578
Change-Id: I7d7fde43333ea6455c4a1b9113bd25e1d88b7dd5
Test: manual
2017-03-16 04:53:05 +00:00
TreeHugger Robot
5a6dafc945 Merge "Enforce RROs for all the build-time ROs" 2017-03-16 04:25:48 +00:00
Jiyong Park
79f5918199 Silence module path warnings for a while
Warning messages like, "libart_fake: framework library must be installed
to system/lib64 but requested to be installed at system/fake-libs64.
Please fix.", are temporarily muted since some of those warnings might
be false alarms.

Let's just silence the warning for everybody and investigate the cases
internally by turning on the build flag SHOW_MODULE_PATH_WARNINGS.

Test: the warning messages should not be shown unless built with
SHOW_MODULE_PATH_WARNINGS=true.

Change-Id: I5eb3ab3385c92a5192723ff1008277c321162191
2017-03-16 12:57:21 +09:00
Simran Basi
c8f21f6c4e device-tests & general-tests: build out zips.
Generates the output zips of the device-tests & general-tests
buildable suites.

Bug: 35386840
Test: make dist device-tests general-tests -j
Change-Id: I253bcd8615379334b52b4d770a5c4f7e07a58795
2017-03-15 17:56:50 -07:00
Colin Cross
47f8853220 resolve merge conflicts of da00e137ec to stage-aosp-master
am: 2afade582d

Change-Id: I17e69cae25f1f8fb4befbfcda6154a2fe9a2df9b
2017-03-15 18:30:37 +00:00
Colin Cross
2afade582d resolve merge conflicts of da00e137ec to stage-aosp-master
Change-Id: Ie81c0f4f5f14ae3e51ee717a50d0c29b26161b90
2017-03-15 10:20:24 -07:00
Treehugger Robot
da00e137ec Merge "Compute PLATFORM_VERSION and PLATFORM_VERSION_CODENAME" 2017-03-15 17:04:58 +00:00
TreeHugger Robot
c7a72d1c5a Merge "Revert "Add LOCAL_ASSET_DIR support (-A) to aapt2"" 2017-03-15 09:02:40 +00:00
Adam Lesinski
7932676215 Revert "Add LOCAL_ASSET_DIR support (-A) to aapt2"
This reverts commit 996bc3ce7b.

Reason for revert: Need to update prebuilts, but prebuilts not built by server yet...

Change-Id: I87deb3ed9512278ff40c185059230dbd66524989
2017-03-15 07:00:41 +00:00
Adam Lesinski
6e4a20e126 Merge "Add LOCAL_ASSET_DIR support (-A) to aapt2" 2017-03-15 02:30:37 +00:00
Colin Cross
4b6bc2b427 Merge "package-modules: use && instead of ; between copy commands" am: e0e20079c2 am: 8843039368
am: d826201c69

Change-Id: Ib5529cd05e439878a1083756e3b73d4d08940809
2017-03-15 02:28:39 +00:00
Colin Cross
d826201c69 Merge "package-modules: use && instead of ; between copy commands" am: e0e20079c2
am: 8843039368

Change-Id: I651caea23c32671a5ff06d65a858db9ed63ff009
2017-03-15 02:23:39 +00:00
Colin Cross
8843039368 Merge "package-modules: use && instead of ; between copy commands"
am: e0e20079c2

Change-Id: I5984eeac0581b8fdd5ae6186291cce02f430e450
2017-03-15 02:18:40 +00:00
Colin Cross
b3bfc7172b Compute PLATFORM_VERSION and PLATFORM_VERSION_CODENAME
Compute PLATFORM_VERSION and PLATFORM_VERSION_CODENAME from
TARGET_PLATFORM_VERSION.  Add explicit values for O, even though
they are the same as the fall backs, as placeholders for future
values.

Bug: 35445510
Test: manual
Merged-In: I30a7142f732c85b637d2ce072373bc867cedcd42
Change-Id: I30a7142f732c85b637d2ce072373bc867cedcd42
2017-03-15 01:10:28 +00:00
Colin Cross
f075bcbc98 package-modules: use && instead of ; between copy commands
Using ; to join commands in a rule causes failures to be ignored by
make.  Use && instead, and add true at the end as the second operand
to the last && operator.

Also inline copy-test-in-batch, batching is no longer necessary as
kati will fall back to a shell script if the recipe is too long to
fit in a command line.

Test: builds
Change-Id: I4a2528bf2a15106cfabaae0336662c4a0464271d
2017-03-14 16:58:34 -07:00
Adam Lesinski
996bc3ce7b Add LOCAL_ASSET_DIR support (-A) to aapt2
Although performing the inclusion of assets/ at a later stage is
preferable, (since aapt just copies the files) do the easy thing and
support what aapt did. In the future perhaps we can zip up the
assets/ directories when also merging in the classes.dex.

Bug: 35461578
Test: manual
Change-Id: I7cd36585e7c292e43b5528969900c6ead2b80c0b
2017-03-14 12:28:09 -07:00
Alex Klyubin
4ed1bc98d1 Merge "Add /file_contexts.bin only to devices which need it" am: 77dab1ed35 am: 47b3e3d92e
am: 932def3aaa

Change-Id: Ib5a66afee6df3017c4ede1610729f66ac445b189
2017-03-14 14:56:55 +00:00
Jaekyun Seok
3070610b72 Enforce RROs for all the build-time ROs
This CL is to generate every static RRO package for its target package
automatically at build-time.

BOARD_ENFORCE_RRO build variable is added to specify whether enforcing
RRO is required or not.

BOARD_ENFORCE_RRO_EXEMPT_SOURCES build variable is added to specify
the module list of which item should be exempt from enforcing RRO.

Test: tested on bullhead and sailfish
Bug: 34097942
Change-Id: I455b2ce34e66c57a540c299b5e378b7c4e78d5b8
2017-03-14 23:55:50 +09:00
Alex Klyubin
932def3aaa Merge "Add /file_contexts.bin only to devices which need it" am: 77dab1ed35
am: 47b3e3d92e

Change-Id: I739ae1146cde7826b8afe67252b67ec5366c08f0
2017-03-14 14:52:23 +00:00
Alex Klyubin
47b3e3d92e Merge "Add /file_contexts.bin only to devices which need it"
am: 77dab1ed35

Change-Id: Ic290b4c919b28bd9110f0f7fd782a564beb53ca0
2017-03-14 14:47:24 +00:00
Treehugger Robot
77dab1ed35 Merge "Add /file_contexts.bin only to devices which need it" 2017-03-14 14:41:31 +00:00
Jiyong Park
3a4326a1cd Merge "fix: cannot determine the type of modules with class 'samples'" am: b1331938a3 am: 0871e0029f
am: bc10ee9771

Change-Id: I2a382c162c67244cd11c44cd481e1a8a44f045ab
2017-03-14 02:31:13 +00:00
Jiyong Park
bc10ee9771 Merge "fix: cannot determine the type of modules with class 'samples'" am: b1331938a3
am: 0871e0029f

Change-Id: I99c7199e7a037e123a6a66e442874c86780def6b
2017-03-14 02:26:44 +00:00
Jiyong Park
0871e0029f Merge "fix: cannot determine the type of modules with class 'samples'"
am: b1331938a3

Change-Id: I2908df25418d37f4be1c653110233900a063af8c
2017-03-14 02:21:43 +00:00
Jiyong Park
d4ca89bfd6 fix: cannot determine the type of modules with class 'samples'
Test: make sdk should not break

Change-Id: I849befde3c6b91f0b417aa6b11a909c6c4aad627
2017-03-14 09:40:29 +09:00
TreeHugger Robot
d32f2916f5 Merge "Use BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED for system props split" 2017-03-14 00:40:13 +00:00
Jiyong Park
3dd9a1fa0a Merge "install *.so in different paths for their types" am: 55b14bdaa4 am: a2b86b14a5
am: 5219726d7f

Change-Id: I68800d6dfd93d97a4c4b7eb0dbec239f734217ee
2017-03-14 00:31:46 +00:00
Jiyong Park
5219726d7f Merge "install *.so in different paths for their types" am: 55b14bdaa4
am: a2b86b14a5

Change-Id: I5aa05455a223fe41bcdfdc5daa2ba7f64b693003
2017-03-14 00:27:17 +00:00
Jiyong Park
a2b86b14a5 Merge "install *.so in different paths for their types"
am: 55b14bdaa4

Change-Id: I170c49e7107dc7f345e844e544e89d1590ad59d3
2017-03-14 00:22:47 +00:00
Treehugger Robot
55b14bdaa4 Merge "install *.so in different paths for their types" 2017-03-14 00:15:50 +00:00
Alex Klyubin
092c9025a9 Add /file_contexts.bin only to devices which need it
/file_contexts.bin is needed only by devices which do not have
PRODUCT_FULL_TREBLE set to true. Adding this file to devices which
have PRODUCT_FULL_TREBLE set to true causes confusion and wastes
about 800 kB of space.

/file_contexts.bin was being added unconditionally to all devices due
to the build system needing the combined file_contexts file for
host-side labelling of filesystems in images and for inclusion into
target files ZIP (again, to be used for host-side labelling later).

This change switches these targets to depend on the same file, but
from intermediates directory. As a result, everything continues to
work just fine, but without pulling in /file_contexts.bin. On devices
which need /file_contexts.bin, it is pulled in by
system/core/init/Android.mk.

Test: /file_contexts.bin still there on bullhead, but not there on
      sailfish with PRODUCT_FULL_TREBLE set to true.
Test: Clean build, device boots up with, no new denials.
      Reboot to recovery, recovery boots up fine too, no denials.
      This was tested on sailfish-eng and marlin-eng.
Bug: 36002414

Change-Id: I9bbbb08bbf7d874bba0bafcc19bcbf9eec564326
2017-03-13 13:28:34 -07:00
Dan Willemsen
ff490b6763 Merge "Speed up *TS zip file creation" am: 6d0f949296 am: 83667a3821
am: d6f077092b

Change-Id: Icf328eb0c239b7bd0a0ba602490860cad02f56db
2017-03-13 20:07:18 +00:00
Dan Willemsen
d6f077092b Merge "Speed up *TS zip file creation" am: 6d0f949296
am: 83667a3821

Change-Id: I7d2bb29787dc475e6b29493c5d81a5482b8e727e
2017-03-13 20:00:16 +00:00
Dan Willemsen
83667a3821 Merge "Speed up *TS zip file creation"
am: 6d0f949296

Change-Id: I082a5072d27d4e93008de98fc864be1e20f03748
2017-03-13 19:55:17 +00:00
Dan Willemsen
6d0f949296 Merge "Speed up *TS zip file creation" 2017-03-13 19:50:44 +00:00
Alex Klyubin
bd6c1e0a7e Merge "Explicitly depend on sepolicy artifacts in recovery targets" am: cc6e84223b am: 05796fe8b3
am: 28fe90f09e

Change-Id: I5112be28a22f2e544d6b71629f29c0ad27d356a0
2017-03-13 18:33:43 +00:00
Alex Klyubin
28fe90f09e Merge "Explicitly depend on sepolicy artifacts in recovery targets" am: cc6e84223b
am: 05796fe8b3

Change-Id: Ic64fea6fe5c50c6b645544f5ebd903e287f7033d
2017-03-13 18:29:12 +00:00
Alex Klyubin
05796fe8b3 Merge "Explicitly depend on sepolicy artifacts in recovery targets"
am: cc6e84223b

Change-Id: I129bfe67ed120254d5b6c8e8f00b0ddfed346156
2017-03-13 18:24:43 +00:00
Alex Klyubin
2a7171a71a Explicitly depend on sepolicy artifacts in recovery targets
This makes recoveryimage/bootimage targets explicitly depend on SELinux
policy artifacts needed by recovery. Prior to this change, the
dependency was contrived: these targets would rely on copying these
files from "root" directory, and then overwriting sepolicy file with
sepolicy.recovery.

Test: Clean build, flash, device boots up just fine. No new denials.
      Reboot into recovery, recovery boot up just fine, no denials.
      This was tested on bullhead (non A/B device) and sailfish (A/B
      device).
Bug: 33642277
Change-Id: Id2369253d0c7e02e079ae01ac7140b41880fd5ad
2017-03-13 08:43:02 -07:00
Jiyong Park
842a985f90 install *.so in different paths for their types
Shared libraries are now installed to different directories depending on
their types.

* NDK libraries: /system/lib/ndk (with symlink from /system/lib)
* VNDK libraries: /system/lib/vndk
* VNDK-ext libraries: /system/lib/vndk-ext
* Framework-only libraries: /system/lib
* Vendor-only libraries: /vendor/lib
* Same-process HALs: /vendor/lib/sameprocess

However, if LOCAL_MODULE_PATH is explicitly set, then it is respected,
with a warning message. Module owners are highly encouraged to
investigate the warnings and use alternatives to LOCAL_MODULE_PATH;
combination of LOCAL_[PROPRIETARY|OEM|ODM]_MODULE, LOCAL_MODULE_CLASS
and LOCAL_RELATIVE_PATH will cover most of the cases.

Furthermore, for each shared libraries whose path is changed, a symolic
link from the original path to the new path is *temporarily* generated.
e.g. /system/lib/libbase.so -> vndk/libbase.so. This is
to prevent sudden breakage of the code expecting the lib from the old
path. This symbolic links will eventually be removed before O launch
(b/34917183).

Finally, BOARD_SAME_PROCESS_HAL_DEPS is added. It contains the list of
shared libraries implementing the same-process HALs and its internal sub
libraries. This is designed to be defined in BoardConfig.mk

Bug: 33681361
Test: build & run. Libraries must be in the correct directories.
Symlinks from the old path to the new path must exist.

Change-Id: I46130aac09ae65400fd4d0abbc2e12dddd154fb1
2017-03-13 08:27:09 +09:00
Dan Willemsen
c4cf49569f Speed up *TS zip file creation
This also makes the resulting zip files more repeatable -- the file list
is sorted and the entries have static timestamps.

On my machine, this saves ~30 seconds for android-cts.zip, it now takes
less than a second.

Test: m -j cts; compare output from without this change
Change-Id: Ia71e35878ff98ba9775115860530e87eee47739f
2017-03-10 13:39:26 -08:00