Commit Graph

50011 Commits

Author SHA1 Message Date
Logan Chien
d5050f82e4 Merge "Update check_elf_file.py for clang-r353983" am: 81589605fd
am: 5d00745b0a

Change-Id: I4af4419a7080e37d1b2b045b8a7d906c703ff9d0
2019-03-21 01:24:00 -07:00
Logan Chien
5d00745b0a Merge "Update check_elf_file.py for clang-r353983"
am: 81589605fd

Change-Id: I0bdb631d5eeae4fd834efa5255ae472d76763935
2019-03-21 01:19:49 -07:00
Logan Chien
81589605fd Merge "Update check_elf_file.py for clang-r353983" 2019-03-21 08:05:16 +00:00
Bowgo Tsai
5ce2f09a8e Merge "Only build system_other.avbpubkey when AVB is enabled" am: dce018769f
am: 20d5f0f821

Change-Id: I7e505c8d169612e3eed0a5f54b126271d4af0577
2019-03-21 00:18:52 -07:00
Bowgo Tsai
20d5f0f821 Merge "Only build system_other.avbpubkey when AVB is enabled"
am: dce018769f

Change-Id: Ic65fb56351e3ae39291a22e5fb260b8e966218e6
2019-03-21 00:13:43 -07:00
Bowgo Tsai
dce018769f Merge "Only build system_other.avbpubkey when AVB is enabled" 2019-03-21 07:01:53 +00:00
Bowgo Tsai
8802b7119d Only build system_other.avbpubkey when AVB is enabled
/product/etc/security/avb/system_other.avbpubkey is only needed
when BOARD_AVB_ENABLE is true. This fixes the build error of
Marlin/Sailfish.

Bug: 123611926
Bug: 129029207
Test: make
Change-Id: I73f948d84f91cd6fbe49a2de7bf12e46eebe6ede
2019-03-21 14:26:33 +08:00
Vic Yang
1485ea8707 Merge changes from topic "vndk-no-vendor-variant" am: 30dda1da5e
am: 38f68f7a2a

Change-Id: Idf7ab78b9ec5ed5e95c1b765dd2a02808d21c3ab
2019-03-20 21:46:43 -07:00
Vic Yang
9b235bbcd5 Add module-target-built-files function am: 1b83413b5a
am: 00e6eb93c9

Change-Id: I907180d6289d925f26717c44a094956c945d20a6
2019-03-20 21:45:57 -07:00
Bowgo Tsai
44446b2a50 Merge "Moving system_other key into product.img" am: 7e87c72fb0
am: 916e876f7a

Change-Id: If6c70e5e0d4fab45cabb86edc068f2c77d339d54
2019-03-20 21:40:19 -07:00
Vic Yang
38f68f7a2a Merge changes from topic "vndk-no-vendor-variant"
am: 30dda1da5e

Change-Id: I646d55e6195a24530bf22d1e7588b2dd99b27eba
2019-03-20 21:39:57 -07:00
Vic Yang
00e6eb93c9 Add module-target-built-files function
am: 1b83413b5a

Change-Id: I91a2d2fa1642bef1564b6efde554df55ffd2f8aa
2019-03-20 21:38:59 -07:00
Bowgo Tsai
916e876f7a Merge "Moving system_other key into product.img"
am: 7e87c72fb0

Change-Id: I29ba3d2056fca68a356cb26a8e17b29d415ed08e
2019-03-20 21:36:24 -07:00
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
5c915e20b1 Merge "Remove protobuf-cpp-full-rtti from mainline" am: 299d782ecd
am: ce0f3e8510

Change-Id: I7ee20b42139f5aaecb642aae613093716860f454
2019-03-20 11:06:44 -07:00
Anton Hansson
ce0f3e8510 Merge "Remove protobuf-cpp-full-rtti from mainline"
am: 299d782ecd

Change-Id: Ic6471c83379bdba95a1b8289ec22776974854eb6
2019-03-20 11:02:09 -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
Treehugger Robot
299d782ecd Merge "Remove protobuf-cpp-full-rtti from mainline" 2019-03-20 17:47:43 +00: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
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
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
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
3e69a4a52d Remove protobuf-cpp-full-rtti from mainline
It used to be depended on by something on /product, but this
is no longer the case.

Bug: 119619080
Test: build downstream users of mainline_system
Change-Id: Iabe1dbb45499b25295f741a62336cb86e4565d60
2019-03-20 13:03:42 +00:00
Anton Hansson
4ea6474e95 Merge "System-specific product sysprops" 2019-03-20 12:40:44 +00: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
Logan Chien
99cdf5385d Update check_elf_file.py for clang-r353983
This commit updates how `check_elf_file.py` parses the symbol name
because the `llvm-readobj` (from clang-r353983) does not print "@" if
the symbol is not versioned.

See also. https://reviews.llvm.org/D56319

Bug: 128959554
Test: CHECK_ELF_FILES=true make check-elf-files
Change-Id: I0dee5e505225e57750a2c86cf0d25a151c218eb1
2019-03-20 15:24:00 +08: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
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