Commit Graph

17954 Commits

Author SHA1 Message Date
Jiyong Park
0c79c5fe48 Merge "Native modules installed to recovery are marked as native:recovery"
am: e3994ecedc

Change-Id: Icf8116486202e664801b982f47ea73154501846b
2018-08-28 07:58:12 -07:00
Treehugger Robot
e3994ecedc Merge "Native modules installed to recovery are marked as native:recovery" 2018-08-28 14:48:55 +00:00
Anton Hansson
688abdb981 Add substitution for product_services and odm.
This enables using PRODUCT_COPY_FILES with these partitions, which
otherwise doesn't work because the list of targets to build/install
contains placeholders.

Bug: 80741439
Test: make
Change-Id: I9d49a3bc5212139a96c58cf550680257811371e2
2018-08-28 15:45:01 +01:00
Neil Fuller
e85777782a Add core-simple to the standard boot classpath
core-simple.jar is being added to the runtime classpath as
an easy-to-find placeholder and to help identify places that
care about the boot classpath / trigger conversations & issues /
force discussion.

See http://go/simple-module

To start, this jar is being added in various locations that know
about core-libart and/or core-oj.  There will be follow-up changes to
make core-simple.jar more than just another core-* jar.

Bug: 113148576
Test: Treehugger
Test: make checkbuild
Change-Id: I267a91b8728f84cfb1b2e8a5c5d157c88b75581c
2018-08-28 13:19:35 +01:00
Neil Fuller
9fb70170d4 Remove out-of-date comment / logic
The comment refers to a core.jar which hasn't existed in
a while.

Bug: 113148576
Test: Treehugger / build only
Change-Id: I032b0e42bb42dfa495f20dca6cd6b4f577052121
2018-08-28 13:18:25 +01:00
David Brazdil
b1082818b3 Encode use of private API in manifest
If a package is declared to build directly against the platform,
this patch will invoke manifest_fixer.py to encode that information
in the manifest. This information is then used by the framework to
correctly configure the runtime process.

Bug: 113315999
Test: m StorageManager; aapt l -a StorageManager.apk|grep usesNonSdkApi
Change-Id: I53c9728d12380a01b35315fc9c58463e9f5a9f48
2018-08-28 12:28:38 +01:00
Anton Hansson
78594e9e1d Merge "Standardize parition build props."
am: d7eaae0f09

Change-Id: Icaf4bb2bccb72fefe93cef6a1cb860c5b609b054
2018-08-28 00:29:28 -07:00
Anton Hansson
d7eaae0f09 Merge "Standardize parition build props." 2018-08-28 07:23:05 +00:00
Jiyong Park
5dc3475d5d Native modules installed to recovery are marked as native:recovery
This fixes a bug that platform module (native:platform) can link to a
recovery module due to the fact that the recovery module is also labeled
as native:platform. Fixing the bug by setting the link type correctly to
native:recovery.

Bug: 113277544
Test: m -j

Change-Id: I88fe0a9d958f2269cf9f9ebc205b2da8c6a761a5
2018-08-28 13:51:52 +09:00
android-build-team Robot
945442b156 Version bump to PQ1A.180824.005
Change-Id: Ia6aa71d667560446c8c668a893a87fab2363814a
2018-08-28 04:22:21 +00:00
android-build-team Robot
876e565e7d Version bump to PQ1A.180824.004
Change-Id: I70f5cc40c09d094682e38a29c077edceab9dcb52
2018-08-28 01:57:44 +00:00
David Brazdil
142c7408d3 Merge "Support hidden API whitelist generated by class2greylist"
am: 7c76579e7a

Change-Id: I2f2a5cf171b9065dcc2ea81cf5282dc59b1fe1ca
2018-08-27 17:24:41 -07:00
David Brazdil
7c76579e7a Merge "Support hidden API whitelist generated by class2greylist" 2018-08-27 21:41:04 +00:00
Anton Hansson
1f8729e635 Standardize parition build props.
This adds a set of standard build properties that are shared
between the system, vendor, odm, product, product_services and
bootimage partitions. The following properties are added:
    ro.X.build.date
    ro.X.build.date.utc
    ro.X.build.fingerprint
    ro.X.build.id
    ro.X.build.tags
    ro.X.build.type
    ro.X.build.version.incremental
    ro.X.build.version.release
    ro.X.build.version.sdk
    ro.product.X.brand
    ro.product.X.device
    ro.product.X.manufacturer
    ro.product.X.model
    ro.product.X.name

vendor and odm already had all of these, but bootimage, product
and product_services only had a subset and system didn't have
any.

Bug: 78359442
Bug: 111491184
Test: m out/target/product/hikey64/system/build.prop and inspect
Change-Id: Ia346d61aec331ed1b9fea12e6a50f1b79147473d
2018-08-27 22:37:15 +01:00
Søren Gjesse
e75eb3d6cb Merge "Ensure that the R8 minification map (ProGuard dictionary) file exists"
am: 6601397608

Change-Id: I76bd988919799e27cc61a780c120cd401fc8a702
2018-08-27 09:14:26 -07:00
Søren Gjesse
6601397608 Merge "Ensure that the R8 minification map (ProGuard dictionary) file exists" 2018-08-27 16:06:07 +00:00
Søren Gjesse
b22934382f Ensure that the R8 minification map (ProGuard dictionary) file exists
R8 no longer outputs an empty map file when minification
(obfuscation) is turned off.

Test: m -j PRODUCT-aosp_x86-eng
Change-Id: I3bd3f2900225dca05a972f46a3b882041e17ba49
2018-08-27 11:19:35 +02:00
Yifan Hong
49b55bb784 Merge changes from topic "resizable_ota"
am: c247436e2f

Change-Id: I220bee2657024b4fa442d64197da1378a5ebc5e4
2018-08-24 16:09:53 -07:00
Yifan Hong
c247436e2f Merge changes from topic "resizable_ota"
* changes:
  Add _b to super.
  Create build-superimage-target.
2018-08-24 23:03:22 +00:00
android-build-team Robot
45a70dd5a4 Version bump to PQ1A.180824.003
Change-Id: I6e56000dcfd0dac22705d8b27b2d12508786efba
2018-08-24 22:57:42 +00:00
android-build-team Robot
f82a328141 Version bump to PQ1A.180824.002
Change-Id: I1e3748d29da864f90f11ccee9e28fb4e7840c571
2018-08-24 22:01:23 +00:00
Anton Hansson
eb22d0122b Merge "Install /system/product_services apps odex in system-other."
am: 6861c9f98d

Change-Id: Ide953726b610b01516659a34d208add756364419
2018-08-24 11:19:13 -07:00
Tao Bao
ec2405a1d1 Merge "Add the missing rule for including product_services.img into vbmeta.img."
am: 2f2b5bb224

Change-Id: I9501761ebab4a2b92015284a17c047acb16979b3
2018-08-24 11:16:21 -07:00
Anton Hansson
6861c9f98d Merge "Install /system/product_services apps odex in system-other." 2018-08-24 18:03:10 +00:00
Treehugger Robot
2f2b5bb224 Merge "Add the missing rule for including product_services.img into vbmeta.img." 2018-08-24 16:51:23 +00:00
Narayan Kamath
e4f41463fd Provisionally increase PLATFORM_MIN_SUPPORTED_TARGET_SDK_VERSION to 23.
Bug: 112828438
Test: m
Change-Id: Id66e19cab1248ce7c89a39e3bd21b7e0dae8c4e7
2018-08-24 16:08:41 +01:00
Narayan Kamath
e7d93422d1 Fix misleading comment in version_defaults.mk
Test: m
Bug: 111003817
Change-Id: Iaf185a2cce0c53b0c3dc52bce2d03ea6df0ca681
2018-08-24 15:17:33 +01:00
Anton Hansson
648b0a875e Install /system/product_services apps odex in system-other.
This will cause odex/vdex files for apps installed under
/system/product_services/{priv-,}app to be installed in system-other
instead of next to the APKs themselves.

This change is analogous to I63406f91acc3de4b4f142767e28d45308706c7da,
which was for /system/product apps.

Test: diff installed-files{,-system-other}.txt on pixel with a PS app
Bug: 80741439
Change-Id: I79fac41cb665a649028f1f0e30350d42e8b80598
2018-08-24 14:59:32 +01:00
Bowgo Tsai
57294c3a87 Merge "Correct PRODUCT_SERVICES_COPY_FILES in envsetup.mk"
am: 916f710b96

Change-Id: I39cac0f4b4d7133ea006f633c374d619ec99df9f
2018-08-24 01:50:54 -07:00
Treehugger Robot
916f710b96 Merge "Correct PRODUCT_SERVICES_COPY_FILES in envsetup.mk" 2018-08-24 08:41:00 +00:00
Tao Bao
0da4347827 Clean up the rules for making vbmeta.img.
This CL intends to be a no-op change to functionality. It prepares for
the upcoming changes that support creating chained VBMeta images.

Bug: 112007947
Test: `m dist` with aosp_taimen-userdebug
Change-Id: Iaac45bde7971b056e17a6e7b0c89336ed206916e
2018-08-23 22:21:13 -07:00
Tao Bao
cee6d0456d Add the missing rule for including product_services.img into vbmeta.img.
Bug: 80741439
Test: `m -j vbmetaimage` for a target that uses product_services image
      (i.e. `BOARD_PRODUCT_SERVICESIMAGE_FILE_SYSTEM_TYPE := ext4`).
      Verify that the generated `vbmeta.img` includes the descriptor for
      `product_services.img`.
Change-Id: Ia2d64523319c3313803acbc63dd56154a0426334
2018-08-23 22:14:28 -07:00
android-build-team Robot
5a51ff6b6c Make change and version bump to PQ1A.180824.001
Change-Id: I442bec7b7a7871f7cbf2438e6ccbf9385ad8b9ba
2018-08-24 03:16:03 +00:00
yangbill
494c9442b6 Merge "Atest: add LOCAL_TEST_CONFIG to module_info.json"
am: be4ad83ef3

Change-Id: I83aadbe82ceebda3b52cb8d7e01003a96f722cec
2018-08-23 20:06:09 -07:00
Treehugger Robot
be4ad83ef3 Merge "Atest: add LOCAL_TEST_CONFIG to module_info.json" 2018-08-24 02:49:52 +00:00
yangbill
c9347b3167 Atest: add LOCAL_TEST_CONFIG to module_info.json
Bug: 112335032

Test: 1. Add LOCAL_TEST_CONFIG := ahat-tests.xml in
         art/tools/ahat/Android.mk for ahat-tests
      2. add ahat-tests.xml in local
      3. atest -m hello_world_test
      4. check module_info.json
         local_full_test_config": ["art/tools/ahat/ahat-tests.xml"]

Change-Id: Ice2a0c85979fa6b872c92aea5ff4a340342408ad
2018-08-24 09:29:11 +08:00
Chih-hung Hsieh
ad3cb5a924 Merge "Define CLANG_TIDY_UNKNOWN_CFLAGS in tidy.mk"
am: 8668e9228a

Change-Id: Ifaf2817f1596ecbf22e4cf363dc5098add91c7b1
2018-08-23 15:34:45 -07:00
Chih-hung Hsieh
8668e9228a Merge "Define CLANG_TIDY_UNKNOWN_CFLAGS in tidy.mk" 2018-08-23 22:23:59 +00:00
Yifan Hong
ebba784d0a Add _b to super.
During OTA, update_engine expects both slots in super,
so that it doesn't have to create the missing slot. Thus,
UUIDs of all logical partitions are consistent. Values
are the result of `uuidgen.py {name}_{slot}` for A/B and
`uuidgen.py {name}` for non-A/B).

Test: adb shell lpdump /dev/block/by-name/super
Bug: 110717529
Change-Id: Ibb90d4dbe1a56bf314d4a02d7aa2f2be18d04855
2018-08-23 09:38:00 -07:00
David Brazdil
b67402ecce Support hidden API whitelist generated by class2greylist
Libcore has support for annotating a virtual method which is known
to change its return type in a future release. This annotation is
recognized by the dexer and a future-proof bridge method is created.
This patch integrates changes in class2greylist to support this
annotation into the build system and generation of hidden API lists.

Calling class2greylist on each boot classpath module now produces two
text files instead of one: signatures for greylisting and now also
whitelisting. They are passed on to the hidden API list generating rules
in frameworks/base.

Bug: 112186571
Test: m appcompat, diff public-list.txt whitelist.txt
Change-Id: I9861203e6e07a17d50850892ec13880971457d11
2018-08-23 10:38:03 +01:00
Bowgo Tsai
d241226936 Correct PRODUCT_SERVICES_COPY_FILES in envsetup.mk
Bug: 80741439
Test: build
Change-Id: Ibc37a1c011ad00a4763911ca0842c74f31d8bc0d
2018-08-23 15:54:34 +08:00
android-build-team Robot
75df03bf29 Make change and version bump to PQ1A.180823.001
Change-Id: Ia6cb777aa2f5cb2bed10f09cfde881e85b53f498
2018-08-23 03:15:21 +00:00
Tao Bao
036af25dbf Merge changes Icf44032f,Iec8524d3
am: da9f2d8fd4

Change-Id: I51804402718a64119ca9cbadc370d9903c9759f8
2018-08-22 17:53:44 -07:00
Tao Bao
da9f2d8fd4 Merge changes Icf44032f,Iec8524d3
* changes:
  Add the missing dependency on BOARD_PREBUILT_DTBOIMAGE.
  use BOARD_PREBUILT_DTBOIMAGE in target-files-package
2018-08-22 23:56:55 +00:00
Yifan Hong
251a02f2f0 Create build-superimage-target.
Combine INSTALLED_SUPERIMAGE_TARGET with INSTALLED_SUPERIMAGE_EMPTY_TARGET.

Also fixes inconsistent UUIDs for super_empty.img
because PRIVATE_SUPER_PARTITION_SUFFIX is not defined.

Test: flash and inspect device mapper
Change-Id: I7f00c4e21ebdd21e94fa387c6e2fbea06a6e75b7
2018-08-22 16:43:57 -07:00
Tao Bao
f4866c72ca Add the missing dependency on BOARD_PREBUILT_DTBOIMAGE.
Test: Use a target that defines `BOARD_INCLUDE_RECOVERY_DTBO := true`
      and BOARD_PREBUILT_DTBOIMAGE. Touching a prebuilt dtbo file
      triggers rebuilding of recovery image.
Change-Id: Icf44032fb29542c6836a401c79fb85345ad6cc3c
2018-08-22 14:40:45 -07:00
cfig
286874053c use BOARD_PREBUILT_DTBOIMAGE in target-files-package
it's better to use the original $(BOARD_PREBUILT_DTBOIMAGE) instead
of AVB-padded $(INSTALLED_DTBOIMAGE_TARGET), the latter will be padded
to the size of /dtbo partition

Test: `make target-files-package` target file RECOVERY/recovery_dtbo is
    the original BOARD_PREBUILT_DTBOIMAGE
Test: `make otapackage` build pass and OTA file works fine

Change-Id: Iec8524d3a0544ddca89481dc613f076b36aeed25
2018-08-22 14:34:55 -07:00
David Anderson
c822a6ef50 Merge "Build image for clean super partition."
am: 10f1a69a2b

Change-Id: If5ca20bbdf0f4f1ad347abb5fd1894c2da2fe8a0
2018-08-22 13:40:30 -07:00
Anton Hansson
f679002cf8 Merge "Fix dump-products."
am: 0de30815ff

Change-Id: I1ee9a37c859f0c87d60aeb2303d9be911ecbda52
2018-08-22 11:58:57 -07:00
Anton Hansson
b12b27f3dc Merge "Make FULL_BUILD not set for the dont_bother case."
am: ae6bf49575

Change-Id: Ic0854f1b23670f8dba252b106ccf3c1e2d3f4086
2018-08-22 11:57:51 -07:00