Commit graph

19792 commits

Author SHA1 Message Date
Vic Yang
30dda1da5e Merge changes from topic "vndk-no-vendor-variant"
* changes:
  Add support for no-vendor-variant VNDK
  Add module-target-built-files function
2019-03-21 04:30:47 +00:00
Treehugger Robot
7e87c72fb0 Merge "Moving system_other key into product.img" 2019-03-21 04:26:21 +00:00
Anton Hansson
3f0f3d447e Merge "Fix the product-graph target" am: 2cad3f68c2 am: 0e941107d4
am: fe21a3cc76

Change-Id: I7b74cd0ddd6f8f9169ecb2e5b478b461a423797b
2019-03-20 10:57:38 -07:00
Anton Hansson
fe21a3cc76 Merge "Fix the product-graph target" am: 2cad3f68c2
am: 0e941107d4

Change-Id: I532416a6c390a2e0ea0414a19049daedff1ca003
2019-03-20 10:54:26 -07:00
Anton Hansson
0e941107d4 Merge "Fix the product-graph target"
am: 2cad3f68c2

Change-Id: I02d010e837752ef4483a0c0fab06b3f5a8f863fa
2019-03-20 10:49:18 -07:00
Anton Hansson
2cad3f68c2 Merge "Fix the product-graph target" 2019-03-20 17:31:41 +00:00
Vic Yang
51512c558c Add support for no-vendor-variant VNDK
When TARGET_VNDK_USE_CORE_VARIANT is set to true, the vendor variant of
VNDK libraries are by default not installed.  Instead, the core variant
will be used by vendor binaries at runtime.

To ensure the core variant of VNDK libraries are installed, we also add
a flag LOCAL_VNDK_DEPEND_ON_CORE_VARIANT to indicate that the vendor
variant module depends on the core variant module.  This flag should be
set by Soong for all VNDK libraries without the vendor variant
installed.  When the flag is set, the vendor variant binary is also
compared against the core variant binary to ensure they are
functionally identical.

As we are merging the two variants for some libraries, we need a new
link type to denote a module is usable as both native:vndk and
native:platform.  We add native:platform_vndk for this.

Bug: 119423884
Test: With the corresponding Soong change, build with
      TARGET_VNDK_USE_CORE_VARIANT set to true.
Test: Add a dummy VNDK library and a dummy vendor binary that depends
      on it.  Build with no-vendor-variant VNDK and check the core
      variant is installed.
Test: Add conditional compilation based on __ANDROID_VNDK__ in the
      dummy VNDK library and check build fails.

Change-Id: I40000f2728e8193212113c1ee950e9d697f2d40d
2019-03-20 10:23:04 -07:00
Vic Yang
1b83413b5a Add module-target-built-files function
This is similar to module-built-files, except that it only returns
files built for the target, not the host.

Bug: 119423884
Test: Build with the no-vendor-variant VNDK change that uses this
      function.

Change-Id: I2a3d99003b05999eae01c0b90bb62b5263d65592
2019-03-20 10:22:21 -07:00
Anton Hansson
0a766e9afa Merge "Refactor generate_enforce_rro" am: bec4aa868a am: f5c74dd470
am: 5784c16fc4

Change-Id: I3d12f8a0f50429e8f54631bedec7e6caf667fb61
2019-03-20 09:23:38 -07:00
Anton Hansson
ba2e4c4a5a Merge "Refactor and further simplify the RRO logic" am: 7c718f37f9 am: 5809544a5a
am: 79ff9538c7

Change-Id: I6220b4cfdd403c33076704abb7d670d391bd70e8
2019-03-20 09:21:21 -07:00
Anton Hansson
5784c16fc4 Merge "Refactor generate_enforce_rro" am: bec4aa868a
am: f5c74dd470

Change-Id: Id4ce71a884dda5a5abf6b131072a13f751b839cf
2019-03-20 09:18:39 -07:00
Anton Hansson
79ff9538c7 Merge "Refactor and further simplify the RRO logic" am: 7c718f37f9
am: 5809544a5a

Change-Id: Ib2de01d13b835d4a7dcd99eef37514e24c414c6c
2019-03-20 09:15:57 -07:00
Anton Hansson
f82f85f0c9 Merge "Add comments and slight refactor auto-RRO logic" am: fce4d099c3 am: 9e8b7550b8
am: 33b3b1f565

Change-Id: Ic7a922d82d7676690cb7907f1e680552730621d5
2019-03-20 09:14:42 -07:00
Anton Hansson
f5c74dd470 Merge "Refactor generate_enforce_rro"
am: bec4aa868a

Change-Id: I1f616f8020f85df60b89cdc3d0f489e9111d0454
2019-03-20 09:10:12 -07:00
Anton Hansson
33b3b1f565 Merge "Add comments and slight refactor auto-RRO logic" am: fce4d099c3
am: 9e8b7550b8

Change-Id: Ie6a6577eeb9eb9694968d10dd1cde1ea874da436
2019-03-20 09:09:25 -07:00
Anton Hansson
597255bc5e Merge "System-specific product sysprops" am: 4ea6474e95 am: ad0e43a4cb
am: 40bf1a78f2

Change-Id: I1e71d3b662dd27c9027129853e21bd5ac55a3e62
2019-03-20 09:08:35 -07:00
Anton Hansson
5809544a5a Merge "Refactor and further simplify the RRO logic"
am: 7c718f37f9

Change-Id: I90af301f8a7fd4713d6f8734080ce73128219fcf
2019-03-20 09:06:45 -07:00
Anton Hansson
9e8b7550b8 Merge "Add comments and slight refactor auto-RRO logic"
am: fce4d099c3

Change-Id: Ie1c5bfcddaabb8315cd4971a21900fddeba1e426
2019-03-20 08:57:07 -07:00
Anton Hansson
40bf1a78f2 Merge "System-specific product sysprops" am: 4ea6474e95
am: ad0e43a4cb

Change-Id: If4199330a673fd62199d3435e57b5298378a0e3a
2019-03-20 08:56:58 -07:00
Anton Hansson
ad0e43a4cb Merge "System-specific product sysprops"
am: 4ea6474e95

Change-Id: Ic86991b8facce69736a1bb484d095b3a132cbd1d
2019-03-20 08:48:31 -07:00
Anton Hansson
bec4aa868a Merge "Refactor generate_enforce_rro" 2019-03-20 15:18:19 +00:00
Anton Hansson
7c718f37f9 Merge "Refactor and further simplify the RRO logic" 2019-03-20 14:35:25 +00:00
Anton Hansson
fce4d099c3 Merge "Add comments and slight refactor auto-RRO logic" 2019-03-20 13:19:56 +00:00
Anton Hansson
4ea6474e95 Merge "System-specific product sysprops" 2019-03-20 12:40:44 +00:00
Anton Hansson
3ef0773932 Merge "Rename DEVICE arg in common buildprops script" am: c371f19e89 am: a0ea5a17e8
am: 1ed2fafd6a

Change-Id: I0eec28ce7fbe8f29588993b1986b70cf52b0497e
2019-03-20 04:09:51 -07:00
Anton Hansson
057f51a2c2 Merge "Fix missing modules check for dont_bother goals" am: f9b6cd6593 am: c61bed91be
am: 34ec0cb0b1

Change-Id: If86ea8d9462a50f0175d5e519eba7dc4b2a73fe7
2019-03-20 04:07:53 -07:00
Anton Hansson
627cf057f9 Fix the product-graph target
Skips the step that invokes dot from the build, and instead
prints suitable commands to convert to image formats.

Bug: 114729998
Test: m product-graph
Change-Id: I172e1a792c32c2685d2f439f414dc66267ed6b83
2019-03-20 11:03:59 +00:00
Anton Hansson
1ed2fafd6a Merge "Rename DEVICE arg in common buildprops script" am: c371f19e89
am: a0ea5a17e8

Change-Id: I692a07be00cf219e5ce5d286c0aae7585c047c48
2019-03-20 03:44:52 -07:00
Anton Hansson
34ec0cb0b1 Merge "Fix missing modules check for dont_bother goals" am: f9b6cd6593
am: c61bed91be

Change-Id: I18623ca6f24e3f1aa0b91e0f6b0beaa79fb74643
2019-03-20 03:43:33 -07:00
Anton Hansson
a0ea5a17e8 Merge "Rename DEVICE arg in common buildprops script"
am: c371f19e89

Change-Id: I24bd162fcfe728f3972eb4e3ce6d5df74ba8bf50
2019-03-20 03:28:08 -07:00
Anton Hansson
c61bed91be Merge "Fix missing modules check for dont_bother goals"
am: f9b6cd6593

Change-Id: I1e1707cf4323851f1465f4dfcc2324a22e5049b8
2019-03-20 03:27:22 -07:00
Anton Hansson
c371f19e89 Merge "Rename DEVICE arg in common buildprops script" 2019-03-20 10:25:01 +00:00
Anton Hansson
f9b6cd6593 Merge "Fix missing modules check for dont_bother goals" 2019-03-20 10:11:50 +00:00
Bowgo Tsai
e4544b1c02 Moving system_other key into product.img
Currently system_other AVB public key is placed in system.img.
However, this makes it's harder to have a *generic* system.img
across different product configs. Moving the key to /product
partition to allow more product-specific AVB keys.

Device board config can add /product/etc/fstab.postinstall,
to mount system_other with this key in /product. It can specify
different mount options, file systems, verity settings, etc., in
this product-specific fstab as well.

Bug: 123611926
Test: `make productimage` checks the following is generated.
      $OUT/product/etc/security/avb/system_other.avbpubkey
      Also checks it's included in $OUT/installed-files-product.{json, txt}

Test: run the following command and checks that
      PRODUCT/etc/security/avb/system_other.avbpubkey is updated:
      ./build/tools/releasetools/sign_target_files_apks \
        --avb_system_other_algorithm SHA256_RSA2048 \
        --avb_system_other_key external/avb/test/data/testkey_rsa2048.pem \
        out/dist/*-target_files-*.zip signed-target_files.zip

Change-Id: I6804f29941bec54375d80bd68a5aedb5c23b842e
2019-03-20 16:18:11 +08:00
Colin Cross
afa2b169f7 Merge "Add x86 AVX2 and AVX512 supported architectures" am: 88e38f01ba am: a31d29ffb6
am: 39e785ff4b

Change-Id: Ie9d066278ee87dd1a9a7309c998e59af0e252abd
2019-03-19 23:39:12 -07:00
Colin Cross
39e785ff4b Merge "Add x86 AVX2 and AVX512 supported architectures" am: 88e38f01ba
am: a31d29ffb6

Change-Id: I08d9073143c9eabb6adc6ebef00c2e3e2e450edb
2019-03-19 23:34:59 -07:00
Colin Cross
a31d29ffb6 Merge "Add x86 AVX2 and AVX512 supported architectures"
am: 88e38f01ba

Change-Id: I79b7bf9f1a0992e27c1e6290c624d4c8545a5f8c
2019-03-19 23:30:50 -07:00
Colin Cross
88e38f01ba Merge "Add x86 AVX2 and AVX512 supported architectures" 2019-03-20 06:22:22 +00:00
Jiyong Park
808ff21cfb Merge "Add LOCAL_SOONG_SYMBOL_PATH" am: 995c632cdc am: 7478fc5a8a
am: d0155c4180

Change-Id: Ib4b1babf0e4215578f480563bb2b6fafd460b4bf
2019-03-19 21:36:55 -07:00
nelsonli
b3abf9d4d2 Merge "Build: Ensuring test runtime dependencies are installed." am: 71ec795e47 am: 1d49779e2f
am: 5cac6f2ac2

Change-Id: I16a037e9a693f6cdbf6886e3445cf02e8e9a12c4
2019-03-19 21:29:02 -07:00
Jiyong Park
d0155c4180 Merge "Add LOCAL_SOONG_SYMBOL_PATH" am: 995c632cdc
am: 7478fc5a8a

Change-Id: I11b2f45cf02700be7b6237c6b6355c998e828089
2019-03-19 21:24:01 -07:00
nelsonli
5cac6f2ac2 Merge "Build: Ensuring test runtime dependencies are installed." am: 71ec795e47
am: 1d49779e2f

Change-Id: I1dd93e3469f4ee366d9f641cbbca2a9f296c7230
2019-03-19 21:23:10 -07:00
Jiyong Park
7478fc5a8a Merge "Add LOCAL_SOONG_SYMBOL_PATH"
am: 995c632cdc

Change-Id: If2569a1e25eedab5f2bcc9ce572a222fc914c184
2019-03-19 21:17:41 -07:00
nelsonli
1d49779e2f Merge "Build: Ensuring test runtime dependencies are installed."
am: 71ec795e47

Change-Id: I8335bb5be06cb118a71d3673b7d6f0812a5432ff
2019-03-19 21:16:57 -07:00
Treehugger Robot
995c632cdc Merge "Add LOCAL_SOONG_SYMBOL_PATH" 2019-03-20 03:01:40 +00:00
Treehugger Robot
71ec795e47 Merge "Build: Ensuring test runtime dependencies are installed." 2019-03-20 01:17:17 +00:00
Jaewoong Jung
8c3d2e571e Merge "Split out app_prebuilt_internal.mk." am: 71638acad7 am: cd290b0804
am: 3182dce1c4

Change-Id: Ib097d659cdee9ed1bfc553097a9040336bba34ac
2019-03-19 18:15:25 -07:00
Jaewoong Jung
3182dce1c4 Merge "Split out app_prebuilt_internal.mk." am: 71638acad7
am: cd290b0804

Change-Id: Ia663707d5877a694e59a06e826e2f8c69448f29d
2019-03-19 18:03:11 -07:00
Jaewoong Jung
cd290b0804 Merge "Split out app_prebuilt_internal.mk."
am: 71638acad7

Change-Id: I749f1c984c837d8838b243f37ea4c34cb6674cd2
2019-03-19 18:00:01 -07:00
Jaewoong Jung
71638acad7 Merge "Split out app_prebuilt_internal.mk." 2019-03-20 00:51:45 +00:00
Daniel Norman
2cc4a17ee6 Merge "Allow disabling building super partition for DAP devices" am: 1bc36fa328 am: 0aa34b44a1
am: 29631f22fe

Change-Id: Idfe38b760cfa68a06e3a548396463d5f4106e1b2
2019-03-19 15:41:35 -07:00
Daniel Norman
29631f22fe Merge "Allow disabling building super partition for DAP devices" am: 1bc36fa328
am: 0aa34b44a1

Change-Id: Ic4c59f377983a4c990be21043510ab20adf52877
2019-03-19 15:29:15 -07:00
Daniel Norman
0aa34b44a1 Merge "Allow disabling building super partition for DAP devices"
am: 1bc36fa328

Change-Id: I674d188302fba37e8fdf2ca76554b9c9d7f9e0c8
2019-03-19 15:22:04 -07:00
Daniel Norman
1bc36fa328 Merge "Allow disabling building super partition for DAP devices" 2019-03-19 22:13:26 +00:00
Jiyong Park
a32f00e553 Add LOCAL_SOONG_SYMBOL_PATH
The soong-only variable is used to specify the location where the symbol
file is located. When unspecified, LOCAL_MODULE_PATH is used instead as
before.

This is needed when the path that a file is installed to is different
from the path that the file is accessed from at runtime. For example, if
TARGET_FLATTEN_APEX=true, a file lib/libX.so in an APEX com.android.foo
is installed to /system/apex/com.android.foo/lib/libX.so. However, it's
runtime path is /apex/com.android.foo/lib/libX.so as
/system/apex/com.android.foo is bind-mounted to /apex/com,android.foo.

Bug: 120846816
Test: m and inspect that symbol files exist under
$(PRODUCT_OUT)/symbols/apex/com.android.runtime/

Change-Id: I1b39f6e0cde115d442f14380c365796feff3437b
2019-03-20 06:56:20 +09:00
Jaewoong Jung
09bfe55bd6 Split out app_prebuilt_internal.mk.
This is part of prebuilt_internal.mk refactoring work and also a
preliminary task to design and implement its Soong counterpart.

Test: built and flashed an image for a Pixel device + TreeHugger
Change-Id: I89b13b1e0a2780b02fda7ee888e73052ac1abd9c
2019-03-19 13:35:23 -07:00
Jared Lim
b378d4d0a5 Merge "Generate api.xml for every target build." am: 22b9a4a207 am: 823e08eea4
am: 74475f02e7

Change-Id: I26be66bbab1cb72927f9b2e62a60d057a7fccb6d
2019-03-19 12:38:38 -07:00
Jared Lim
74475f02e7 Merge "Generate api.xml for every target build." am: 22b9a4a207
am: 823e08eea4

Change-Id: I28e4d85eb5c74ef8996b740d01e0a9c9763eb38d
2019-03-19 12:34:26 -07:00
Jared Lim
823e08eea4 Merge "Generate api.xml for every target build."
am: 22b9a4a207

Change-Id: I9751cb5a72b32e4ba1c6b0ca87dfd7695ee0e107
2019-03-19 12:30:15 -07:00
Treehugger Robot
22b9a4a207 Merge "Generate api.xml for every target build." 2019-03-19 19:18:16 +00:00
Anton Hansson
fa7ddae29b Fix missing modules check for dont_bother goals
Like If1f817d855cbe329b83caee9fdd68c2cce55f02b, but for
PRODUCT_PACKAGES, which is only enabled for a few builds.

Also share the ALLOW_MISSING_DEPENDENCIES check with the host
version.

Test: m product-graph
Change-Id: Iab55072e7d7c0fc9f4680cc515e139a5214dc3b4
2019-03-19 18:20:30 +00:00
Logan Chien
98af3cf0ea Merge "Fix check_elf_file with LOCAL_SDK_VERSION and NDK libs" am: ab28c2d4ef am: 9e7d8b77a4
am: d5cbb5eba3

Change-Id: I4d00444d8af19f5ab6a1800a79d4ede457a157ed
2019-03-19 02:30:53 -07:00
Logan Chien
d5cbb5eba3 Merge "Fix check_elf_file with LOCAL_SDK_VERSION and NDK libs" am: ab28c2d4ef
am: 9e7d8b77a4

Change-Id: I7936a84b3ec41760739707fc54b89424489f0ed8
2019-03-19 02:26:34 -07:00
Logan Chien
9e7d8b77a4 Merge "Fix check_elf_file with LOCAL_SDK_VERSION and NDK libs"
am: ab28c2d4ef

Change-Id: I90ef9805a09710c9ced9775f4aab2a3b869a83aa
2019-03-19 02:22:25 -07:00
Logan Chien
ab28c2d4ef Merge "Fix check_elf_file with LOCAL_SDK_VERSION and NDK libs" 2019-03-19 09:09:50 +00:00
nelsonli
fe04351f6f Build: Ensuring test runtime dependencies are installed.
After migrating the primary install location of test modules into a
    generic testcase folder. All test modules will install to
    out/target/product/<product>/testcase/<module_name>/ if they don't
    specify their LOCAL_MODULE_PATH.
    But the dependent test module should also be copied to testcase
    folder even its LOCAL_MODULE_PATH be set.

BUG: 128815093
Test: 1. vi cts/tests/signature/api-check/Android.mk
        add LOCAL_MODULE_PATH for cts-hiddenapi_flags-csv
      2. m CtsHiddenApiBlacklistDebugClassTestCases
         Then, hiddenapi_flags.csv should also be copied to testcase
	 folder.

Change-Id: Iff872447348e74b2728e0913d04e46ccbaa4e972
2019-03-19 08:12:20 +00:00
Jared Lim
361e4439d0 Generate api.xml for every target build.
Test: make dist DIST_DIR=out/dist

Change-Id: I8cf7290c8a3757110761e9c852339b841c5d1748
2019-03-18 22:42:07 -07:00
Colin Cross
f1f2fdb2b6 Merge "Add a dependency on boot jars $(LOCAL_BUILT_MODULE)" am: c2144bb0c4 am: f9953860b0
am: 1d3caff3c0

Change-Id: If62196568ce29e96aca19e4e3f43005c2c554487
2019-03-18 22:24:09 -07:00
Bowgo Tsai
c1c511a195 Merge "Sets default value of ro.postinstall.fstab.prefix" am: b6520ddcf1 am: cf4ee6ac23
am: c42b681fca

Change-Id: I4ad8a50fd4bcce3b8b6c1f0c75f764eb3dd3c241
2019-03-18 22:22:20 -07:00
Colin Cross
1d3caff3c0 Merge "Add a dependency on boot jars $(LOCAL_BUILT_MODULE)" am: c2144bb0c4
am: f9953860b0

Change-Id: I73d64e79268603d4c0088c6e4225a830e0e04a8f
2019-03-18 22:19:44 -07:00
Bowgo Tsai
c42b681fca Merge "Sets default value of ro.postinstall.fstab.prefix" am: b6520ddcf1
am: cf4ee6ac23

Change-Id: I940adcc68419e660ba27294a7b4f8a2f6e299074
2019-03-18 22:18:10 -07:00
Colin Cross
f9953860b0 Merge "Add a dependency on boot jars $(LOCAL_BUILT_MODULE)"
am: c2144bb0c4

Change-Id: I670fb51e3bc4f859c9716bad277dd09d8c5e3806
2019-03-18 22:15:24 -07:00
Bowgo Tsai
cf4ee6ac23 Merge "Sets default value of ro.postinstall.fstab.prefix"
am: b6520ddcf1

Change-Id: I0ec7a2b917b8bf227b68ef1c58d307a1c5328170
2019-03-18 22:14:00 -07:00
Treehugger Robot
c2144bb0c4 Merge "Add a dependency on boot jars $(LOCAL_BUILT_MODULE)" 2019-03-19 05:08:26 +00:00
Treehugger Robot
b6520ddcf1 Merge "Sets default value of ro.postinstall.fstab.prefix" 2019-03-19 05:02:58 +00:00
Yifan Hong
45a05bc545 Merge "Add supernod build target." am: 691defc4bd am: 5aec484888
am: 2725896bce

Change-Id: I5b83bc2af99d65c43660b3b764c3f7b5f2a0471a
2019-03-18 18:01:46 -07:00
Yifan Hong
2725896bce Merge "Add supernod build target." am: 691defc4bd
am: 5aec484888

Change-Id: Ifd1d3ed4c30cb83ab6aec0a3f7f52806c39743bd
2019-03-18 17:47:14 -07:00
Yifan Hong
5aec484888 Merge "Add supernod build target."
am: 691defc4bd

Change-Id: I5716c6a8028bb6c7beaf2ecbdd6ea28e44ad07ec
2019-03-18 17:06:47 -07:00
Yifan Hong
691defc4bd Merge "Add supernod build target." 2019-03-18 23:46:05 +00:00
Colin Cross
3ecb9c4fdd Add a dependency on boot jars $(LOCAL_BUILT_MODULE)
After I25163e91886cea6941afa25cdb529ed053278dcb there is no longer
a dependency on $(LOCAL_BUILT_MODULE) for boot jars, as boot.art
is installed instead.  Add a dependency from boot.art to
$(LOCAL_BUILT_MODULE) so that $(LOCAL_BUILT_MODULE) and its
dependencies (which may include jacoco-report-classes.jar) is
copied for every build.

Fixes: 127702563
Test: forrest
Change-Id: I4db2d1f5fe2e1141fe93317cd7a2a58a33f8fbff
2019-03-18 13:17:22 -07:00
Anton Hansson
dc017122fb Read product/device RRO dirs separately from soong
This change splits the LOCAL_SOONG_RRO_DIRS into two,
representing RRO dirs that originated from device and
product overlay configs, respectively.

Also plumb the device/product configs in separately.

Bug: 127758779
Test: verify noop on presubmit targets
Change-Id: Iddee1b4d7303b7ecaeced91216ea82fe29123770
2019-03-18 19:39:51 +00:00
Yifan Hong
889b1f7c0c Allow disabling building super partition for DAP devices
Previously:
if (DAP && !BUILD_SUPER) error;

Now:
if (BUILD_SUPER && !DAP) error;

This allows DAP devices to disable building super partition when the OEM
doesn't want to. The ability to build super partition shouldn't be
a requirement of enabling DAP; rather, building super partition requires
DAP to be enabled.

To do this on a device, PRODUCT_BUILD_SUPER_PARTITION should be set
to false explicitly. If it is unset, it will use the value of
PRODUCT_USE_DYNAMIC_PARTITIONS.

Bug: 127687287
Test: set PRODUCT_BUILD_SUPER_PARTITION to false and build dist

Change-Id: I25f1866e61d73affb445c1aec042cf53aac93583
2019-03-18 11:48:03 -07:00
Anton Hansson
08231e1786 Refactor generate_enforce_rro
A few tweaks to make it easier to extend to generating RROs in
multiple partitions:
- deduce the module name inside generate_enforce_rro
- dedup rule definition
- tweak framework-res check to use source module name instead

Bug: 127758779
Test: verify noop on presubmit targets
Change-Id: I2f0d6270b21f5427c372c04a5c6e7fb712e72a9a
2019-03-18 14:21:09 +00:00
Anton Hansson
b7ee86ff85 Refactor and further simplify the RRO logic
Make the runtime vs static resource overlays a little clearer.
This will help adding more logic around determining if an RRO
needs to be generated in /vendor, /product or both.

Bug: 127758779
Test: verify noop on presubmit targets
Change-Id: I43111a1d9bb3405c559faaef56a75a5ad7672ba0
2019-03-16 15:52:30 +00:00
Benjamin Gordon
9204856d11 Merge "Add stoney ridge x86 variant" am: 8c2881034a am: b3a6164a9b
am: 9c676bb5a8

Change-Id: I006c21cf4035bf0d0bfda3d5b7a93ed0955e53be
2019-03-15 15:57:00 -07:00
Benjamin Gordon
9c676bb5a8 Merge "Add stoney ridge x86 variant" am: 8c2881034a
am: b3a6164a9b

Change-Id: Ief0e31de64b0bc9ccc7e11941a114241599f2aa4
2019-03-15 15:40:01 -07:00
Benjamin Gordon
b3a6164a9b Merge "Add stoney ridge x86 variant"
am: 8c2881034a

Change-Id: I43d012b9755e593b3b5c34c88254b51b52f63201
2019-03-15 15:33:32 -07:00
Treehugger Robot
8c2881034a Merge "Add stoney ridge x86 variant" 2019-03-15 21:41:32 +00:00
Anton Hansson
fd06b02b30 Add comments and slight refactor auto-RRO logic
Make it a bit clearer what this code is intended to do.

Bug: 127758779
Test: verify noop on presubmit targets
Change-Id: Ic405fc5d4601b9f0a91b4d24caa06f279267c51a
2019-03-15 17:03:53 +00:00
Roland Levillain
fc65a5ff1a Merge "Remove valgrind-test-art% targets from PARSE_TIME_MAKE_GOALS." am: dbfe39faa2 am: 0e0ffc1053
am: 1f355b181d

Change-Id: Ibd5f12a83f86e0bae17e3ad17606bdf1e824a5c3
2019-03-14 06:42:07 -07:00
Roland Levillain
1f355b181d Merge "Remove valgrind-test-art% targets from PARSE_TIME_MAKE_GOALS." am: dbfe39faa2
am: 0e0ffc1053

Change-Id: I91aa17f26b372b301386c880c2ec66821fe6ec6a
2019-03-14 06:36:55 -07:00
Roland Levillain
0e0ffc1053 Merge "Remove valgrind-test-art% targets from PARSE_TIME_MAKE_GOALS."
am: dbfe39faa2

Change-Id: I065fc822abc7b9dda99e1fc83ef32f07a47e8b3a
2019-03-14 06:31:45 -07:00
Roland Levillain
dbfe39faa2 Merge "Remove valgrind-test-art% targets from PARSE_TIME_MAKE_GOALS." 2019-03-14 13:17:46 +00:00
Bowgo Tsai
ddac7dcce1 Sets default value of ro.postinstall.fstab.prefix
ro.postinstall.fstab.prefix might be either "/system" or "/product",
to decide the location of the fstab.postinstall, used to mount
system_other partition on A/B devices.

  {ro.postinstall.fstab.prefix}/etc/fstab.postinstall

Bug: 112103720
Test: factory reset and boot device, checks cppreopt logs

Change-Id: Ib1e282752c37713e2220239f4f903453ce3c8bab
2019-03-14 16:03:04 +08:00
Nelson Li
ed516e293d Merge "Revert "Revert "Build System: Solve dependency problem for test""" am: 795721ac2a am: 3c4c86943c
am: fd71578493

Change-Id: I369b55cbd93ff3dd679fdbc67cb05c712ca3ed5f
2019-03-13 21:43:13 -07:00
Nelson Li
fd71578493 Merge "Revert "Revert "Build System: Solve dependency problem for test""" am: 795721ac2a
am: 3c4c86943c

Change-Id: I735cae7b8d68db780eac51868a1ef0fd9b22c5e9
2019-03-13 21:39:07 -07:00
Nelson Li
3c4c86943c Merge "Revert "Revert "Build System: Solve dependency problem for test"""
am: 795721ac2a

Change-Id: Ic5a66836b748dbe18a5b67a55896a0ae041dfc6c
2019-03-13 21:34:55 -07:00
Treehugger Robot
795721ac2a Merge "Revert "Revert "Build System: Solve dependency problem for test""" 2019-03-14 04:23:32 +00:00
Nelson Li
1f8357fe7d Revert "Revert "Build System: Solve dependency problem for test""
This reverts commit 6fe7f194b9.

Reason for revert: Fixed all build break.

Change-Id: I0a4842df1225399752515a4cd7a7c14173a5bf7b
2019-03-14 01:05:36 +00:00
Yifan Hong
69e0d61cbe Add supernod build target.
superimage-nodeps and supernod depends
on images from $(ANDROID_PRODUCT_OUT) (not from
target files package). It doesn't rebuild source
images if they are present.

A typical workflow is:

    m -j
    # change code in system
    m snod -j
    m supernod -j

Test: For non retrofit, run:
      `m snod -j; m supernod -j`
Fixes: 128321505
Change-Id: Ib8c011cadb9c0cd334234aef39f19be6a48fee62
2019-03-13 11:15:21 -07:00