Commit Graph

955 Commits

Author SHA1 Message Date
Jasmine Cha
a2423094a0 Merge "Add waves to vendor owner whitelist" into pi-dev
am: eeb98ae3df

Change-Id: Ia9ddc90c477170b0afc2e77b7499d3403eb332e1
2018-05-22 00:31:32 -07:00
TreeHugger Robot
eeb98ae3df Merge "Add waves to vendor owner whitelist" into pi-dev 2018-05-22 07:26:54 +00:00
Alan Ma
0e619a0023 Merge "Add a build task for cts_instant" into pi-dev am: 07d33802b3
am: 4292ea6696

Change-Id: I1849c9da558acaf545b4ba1400fd24f1bc941b06
2018-05-21 13:42:31 -07:00
Alan Ma
4292ea6696 Merge "Add a build task for cts_instant" into pi-dev
am: 07d33802b3

Change-Id: Ide0ee7a30700a34823abed77493fba4f55458517
2018-05-21 13:30:41 -07:00
Alan Ma
c2e074c081 Add a build task for cts_instant
Test: With other CLs in the topic, run 'm -j30 cts_instant'

bug: 79750671
Change-Id: Ib0381017300108a22919892070540b9e7f92aaf9
2018-05-18 14:09:03 -07:00
Fang Deng
901f056e5d Merge "[DO NOT MERGE][Harness Separation] Update cts.mk to point to the new harness repo" into pi-dev
am: 7c2a9d258f

Change-Id: I57cfbd587b71aa14783b0ec140dff7628968f42f
2018-05-15 21:42:01 -07:00
Fang Deng
4b32c5ead6 [Harness Separation] Update cts.mk to point to the new harness repo
CTS harness code is moved to the new git project.
Update cts.mk to point to the new repo.

Bug: 78461075
Bug: 79201478
Bug: 79695450
Test: make cts -j32 WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY=true
TARGET_PRODUCT=aosp_arm64
Test: cts-tradefed run cts --compatibility:include-filter
CtsGestureTestCases
Test: cts/run_unit_tests.sh
Test: make gts -j32 WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY=true
TARGET_PRODUCT=aosp_arm64

Change-Id: I2a07295399b27cf75d3a6902234530dd74810070
2018-05-15 18:52:18 -07:00
Fang Deng
42b9e05754 [DO NOT MERGE][Harness Separation] Update cts.mk to point to the new harness repo
CTS harness code is moved to the new git project.
Update cts.mk to point to the new repo.

Bug: 78461075
Bug: 79201478
Bug: 79695450
Test: make cts -j32 WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY=true
TARGET_PRODUCT=aosp_arm64
Test: cts-tradefed run cts --compatibility:include-filter
CtsGestureTestCases
Test: cts/run_unit_tests.sh
Test: make gts -j32 WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY=true
TARGET_PRODUCT=aosp_arm64

Change-Id: I94c03071ec3db5a52c0fc0185bf69e2e57da9b21
2018-05-15 18:28:24 -07:00
Nan Zhang
7e4dd1478e Remove tasks/apicheck.mk
1. Remove tasks/apicheck.mk
2. Convert apicheck tool build to Soong.

Bug: b/78034256
Test: m clean && m checkapi

Change-Id: I0ebdd76586ceb7a90e4d9c10714cbd94b38ef869
Merged-In: I0ebdd76586ceb7a90e4d9c10714cbd94b38ef869
2018-05-15 14:16:13 -07:00
TreeHugger Robot
df24c51b24 Merge "Remove tasks/apicheck.mk" into pi-dev-plus-aosp 2018-05-15 18:15:08 +00:00
Xin Li
da4bc44a65 Merge "Use correct case for GPL." am: 3e83e84115
am: dcf513c288

Change-Id: Id4e8272d36f0551b251c16a73c787a3575277259
2018-05-15 10:30:45 -07:00
Nan Zhang
02ca404a00 Remove tasks/apicheck.mk
1. Remove tasks/apicheck.mk
2. Convert apicheck tool build to Soong.

Bug: b/78034256
Test: m clean && m checkapi

Change-Id: I0ebdd76586ceb7a90e4d9c10714cbd94b38ef869
2018-05-15 10:13:30 -07:00
Xin Li
9335117d7e Use correct case for GPL.
Test: build
Change-Id: Id8c671b142231a9c4baeac3a7b9e3cd328b3217e
2018-05-15 08:37:16 -07:00
Jasmine Cha
61b2c70815 Add waves to vendor owner whitelist
Bug: 74360112
Test: AOSP build pass
Change-Id: I7dd78f13fec495111d82828229afabe53abba712
2018-05-14 21:50:28 +00:00
Fang Deng
fb556b019c Merge "[Harness Separation] Move cts-tradefed to a new dir (cts.mk)" into pi-dev
am: 428d477bf1

Change-Id: Ieecd6a0899e706155c506ef2fae05f700cde65b9
2018-05-03 15:53:20 -07:00
Fang Deng
8ebc942152 [Harness Separation] Move cts-tradefed to a new dir (cts.mk)
Move cts-tradefed to a new dir.
Fix cts.mk to point to the new dir.
Bug: 78461075
Bug: 79201478
Test: make cts -j32 WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY=true TARGET_PRODUCT=aosp_arm64
Test: cts-tradefed run cts --compatibility:include-filter CtsGestureTestCases
Test: cts/harness/tools/cts-tradefed/tests/run_tests.sh
Test: make gts -j32 WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY=true TARGET_PRODUCT=aosp_arm64

Change-Id: I8b610bf2f0b84baa7e8a30759f7d53d1b2a5d8f1
2018-05-03 10:53:37 -07:00
Anton Hansson
272035c19c Merge "Move apicheck.mk off SRC_API_DIR." am: a1dc661f71
am: 02cae4c505

Change-Id: I93bcd3521b72eb932d3aeed2a5a5dc4d1a9bc35e
2018-05-03 06:31:48 -07:00
Anton Hansson
a1dc661f71 Merge "Move apicheck.mk off SRC_API_DIR." 2018-05-03 13:18:25 +00:00
Dan Shi
558f136a9b Merge "Allow tests to be disabled for presubmit check" am: 4c7d849a1b
am: b5fd7133ae

Change-Id: If6ccceb0e85c88a1aa70eb939d93cfe97c9dc28e
2018-04-19 14:10:50 -07:00
Anton Hansson
5aded2ff26 Move apicheck.mk off SRC_API_DIR.
This directory is getting deleted.

Also remove the variable, the other uses are being removed in this cl:
I1d4e87e7840e979b83779a2aefe176e7c1ed1527

Bug: 77525052
Test: Verified value of last_released_sdk_version variable.
Change-Id: I69b10ad83a8c06d337606df91e8d3b604adfef70
2018-04-19 17:17:31 +01:00
Dan Shi
639c6ccf7a Allow tests to be disabled for presubmit check
A test can be disabled in two ways:
1. Add the test name to ALL_DISABLED_PRESUBMIT_TESTS variable.
   Integration tests (tests inside TradeFed) can only be disabled in
   this way.
2. In module config, set LOCAL_PRESUBMIT_DISABLED to true. This works
   for tests with build target.

This change allows tests to be skipped in presubmit check to be saved in
a list that's included in test-mappings.zip build artifact.

Bug: 74971025
Test: m dist -j test-mapping
Change-Id: I6e3016b017ce1ade024dc4ded72a10c778b88e7f
2018-04-17 12:07:31 -07:00
Dan Willemsen
5046d4c749 Disable warnings for unknown modules in package-modules.mk
We've had these warnings for a while, but we've still got a lot of
warnings that people have been trained to ignore. Lets just silence them
for now.

The Merged-In is just a random change from AOSP that isn't in pi-dev, to
stop this from being merged to master, where I'm just fixing the
warnings.

Bug: 77883700
Test: m  <fewer warnings>
Change-Id: I00d8173a527760d62dca5837bcc86d5f03b87e83
Merged-In: I78ca65e6f0c81f09e7da848eda797b3a8f97a521
2018-04-10 22:44:28 -07:00
Nan Zhang
82d40c4874 Add dist-for-goals for droiddoc docs.zip
Old droiddoc will install the *-docs.zip & API files to the dist.

And also remove INTERNAL_PLATFORM_*API_FILE variables from config.mk and
get rid of the dependencies on api-stubs, system-api-stubs, test-api-stubs
timestamp.

Test: m -j api-stubs-docs
Bug: b/70351683
Change-Id: I08923bb5f62d2f55961d9a2865723d7b3fae7206
Merged-In: I08923bb5f62d2f55961d9a2865723d7b3fae7206
2018-03-20 16:23:22 -07:00
Nan Zhang
0aa96a05fb Add dist-for-goals for droiddoc docs.zip
Old droiddoc will install the *-docs.zip & API files to the dist.

And also remove INTERNAL_PLATFORM_*API_FILE variables from config.mk and
get rid of the dependencies on api-stubs, system-api-stubs, test-api-stubs
timestamp.

Test: m -j api-stubs-docs
Bug: b/70351683
Change-Id: I08923bb5f62d2f55961d9a2865723d7b3fae7206
Merged-In: I08923bb5f62d2f55961d9a2865723d7b3fae7206
2018-03-20 11:42:23 -07:00
Julien Desprez
5b9602634b Merge "Add loganalysis to cts" am: ee9ea1d601
am: 6d948a6cf5

Change-Id: Id523f239f07720b131a175f61118878b591a1ca0
2018-03-20 03:10:14 +00:00
jdesprez
ccbedae0e6 Add loganalysis to cts
Tradefed depends on Loganalysis so it should also be part
of cts. Luckily there was no overlap (cts never called a
part of TF that use loganalysis) so it never failed
with classNotFound before.

Test: build cts
Bug: 75979908
Change-Id: I65edf4d1a46c20875e31a61ddfcd343dd7c639aa
Merged-In: I2542ecd077149f7165aff120d67054943df20b54
2018-03-19 23:49:33 +00:00
jdesprez
4619031efe Add loganalysis to cts
Tradefed depends on Loganalysis so it should also be part
of cts. Luckily there was no overlap (cts never called a
part of TF that use loganalysis) so it never failed
with classNotFound before.

Test: build cts
Bug: 75979908
Change-Id: I2542ecd077149f7165aff120d67054943df20b54
2018-03-19 16:47:22 -07:00
Tobias Thierer
fcf943b14d Merge "Clarify error message for bootclasspath whitelist." am: 0d6a25c73f
am: 17f31a1146

Change-Id: Ic08b0bce25bc9ea802e7f4b3a7fecf02fe874f79
2018-03-06 19:27:50 +00:00
Treehugger Robot
0d6a25c73f Merge "Clarify error message for bootclasspath whitelist." 2018-03-06 18:24:11 +00:00
Tobias Thierer
7b179ae177 Clarify error message for bootclasspath whitelist.
Before this CL, the build could fail with error messages such as:

Error: out/target/common/obj/JAVA_LIBRARIES/core-oj_intermediates/classes.jar
contains class file jdk/internal/HotSpotIntrinsicCandidate.class, which is not
in the whitelist

This error message was only moderately helpful because it left a few
questions unanswered or misled ("Whitelist for what?", "Where does the
whitelist live?", "Is it a whitelist of class files or of packages?").

This CL clarifies that:
 - it's a whitelist of packages allowed on the bootclasspath,
 - where it lives (currently
   build/make/core/tasks/check_boot_jars/package_whitelist.txt)
which makes the error message more actionable.

Test: manually checked that the error message now looks okay.
Bug: 17434570

Change-Id: I2f52a5e2eb532bc4945bedf9811de5857f67a9a3
2018-02-22 14:42:28 +00:00
Nan Zhang
972bd248f9 Merge "Use BUILD_NUMBER_FROM_FILE instead of BUILD_NUMBER in Make." am: d3bec931cd am: 90b8d087e6
am: 7e634580ba

Change-Id: I514525914843c2cad6591ed6f515aed3aecc286a
2018-02-22 02:36:22 +00:00
Nan Zhang
7e634580ba Merge "Use BUILD_NUMBER_FROM_FILE instead of BUILD_NUMBER in Make." am: d3bec931cd
am: 90b8d087e6

Change-Id: I7360282931fa4646e733f7326aea5a2a3cea1a97
2018-02-22 02:29:18 +00:00
Nan Zhang
0abdb5811d Use BUILD_NUMBER_FROM_FILE instead of BUILD_NUMBER in Make.
<Two phase commits> Since internal master code has more places that use
BUILD_NUMBER (mostly in vendor/) than AOSP (conflict). We can't
deprecate BUILD_NUMBER directly. Therefore, we try to switch to
BUILD_NUMBER_FROM_FILE as much as possible at first. Then we will do
a one-off deprecation for BUILD_NUMBER in internal master next step.

Test: m -j
Bug: b/70351683
Change-Id: I14ffee7381933c9fde14c4bde8c0c14e45fe98bf
2018-02-21 14:12:18 -08:00
Jae Shin
df0ca38484 Merge changes Ida449978,I8c6953f1 am: 8b759c08ca am: 6d5a2d54ff
am: 1e9b97e595

Change-Id: Ia3a7e7cd5319321bc97f482e9f0d0e2ad887666e
2018-01-05 01:36:44 +00:00
Jae Shin
1e9b97e595 Merge changes Ida449978,I8c6953f1 am: 8b759c08ca
am: 6d5a2d54ff

Change-Id: Ic7606d7572e7143324a210d56ce641f038d6b815
2018-01-05 01:31:12 +00:00
Jae Shin
8b759c08ca Merge changes Ida449978,I8c6953f1
* changes:
  Apply snapshot variant to vndk package module name
  Additionally package TARGET_2ND_ARCH variants
2018-01-05 01:16:06 +00:00
Justin Yun
825cd12add Merge "BOARD_VNDK_RUNTIME_DISABLE must not be "true" for VNDK snapshot" am: fd3f4570fa am: 4c4976b2d2
am: 22b52db8eb

Change-Id: I6b4387271135f78aca240b3a1d677efc602859b3
2018-01-05 01:06:09 +00:00
Justin Yun
22b52db8eb Merge "BOARD_VNDK_RUNTIME_DISABLE must not be "true" for VNDK snapshot" am: fd3f4570fa
am: 4c4976b2d2

Change-Id: Ibedfef2ce641588e883e7bb1bc81929cc2ba2c5a
2018-01-05 00:55:32 +00:00
Justin Yun
4dff0c6974 BOARD_VNDK_RUNTIME_DISABLE must not be "true" for VNDK snapshot
When generating VNDK snapshot, BOARD_VNDK_RUNTIME_DISABLE must not be
'true' to have correct ld.config.txt file.

Bug: 71349776
Test: lunch aosp_arm64_ab-user; make -j vndk dist
Change-Id: I20b14addb2f4a191134a1a9943e328566ca48424
2018-01-05 09:40:47 +09:00
Jae Shin
7b02f90ab7 Merge "Apply change in prebuilt names for config files" am: b0f4677748 am: 67eabefbdb
am: bd0483aa1c

Change-Id: I51c348d36a4597251409962d5b2801478c558a06
2018-01-04 20:30:41 +00:00
Jae Shin
bd0483aa1c Merge "Apply change in prebuilt names for config files" am: b0f4677748
am: 67eabefbdb

Change-Id: I9027a54b8e36386c26ec5a088524a91d2e6a989b
2018-01-04 20:26:37 +00:00
Jae Shin
893fca6e46 Additionally package TARGET_2ND_ARCH variants
Redefine VNDK snapshot top level dir with $(TARGET_PRODUCT) and
additionally package TARGET_2ND_ARCH build variants of libs since
they are needed by 32bit processes running on a 64bit device.

Test: m -j vndk dist
Bug: 71370248
Change-Id: I8c6953f1b52b61caf413559bab56b294479b6d86
2018-01-04 10:23:10 +09:00
Jae Shin
77c07dd6d0 Apply change in prebuilt names for config files
The suffix for VNDK config files ld.config.txt,
llndk.libraries.txt, and vndksp.libraries.txt has been changed to
*.$(PLATFORM_VNDK_VERSION).txt.

Refactor the paths-of-intermediates function such that instead of
parsing filenames from list of modules within the function,
provide the function a list of preprocessed
module_name:file_name pairs.

Bug: 70918357
Test: m -j vndk dist
Change-Id: I2d69b7822cef4c709e15a53f99c7ab2efb22406c
2018-01-04 10:07:30 +09:00
Bo Hu
dbc18ce057 Merge "emulator: add check_emu_boot.mk, again" am: 59e41c11d5 am: d7c9a7384a
am: d49a41350a

Change-Id: I52094812c9214340800f6ed3f0674ff8405b7f0c
2017-12-27 22:32:45 +00:00
Bo Hu
d49a41350a Merge "emulator: add check_emu_boot.mk, again" am: 59e41c11d5
am: d7c9a7384a

Change-Id: Id9b9e9d5421b6f5ba5717bd7c1a13ba8f3e4ac1d
2017-12-27 22:29:40 +00:00
Bo Hu
59e41c11d5 Merge "emulator: add check_emu_boot.mk, again" 2017-12-27 22:22:10 +00:00
Jae Shin
fc52ef0a23 Merge "Add check to ensure PLATFORM_VNDK_VERSION is set" am: 13349ed3c2 am: a085258968
am: 2dc0a3860e

Change-Id: Ifb8947460156924ac8b682fa66aeaa23c3f3037a
2017-12-26 02:00:51 +00:00
Jae Shin
2dc0a3860e Merge "Add check to ensure PLATFORM_VNDK_VERSION is set" am: 13349ed3c2
am: a085258968

Change-Id: I7d541c300ef228ad045e168a0354ed690686c086
2017-12-26 01:57:46 +00:00
Treehugger Robot
13349ed3c2 Merge "Add check to ensure PLATFORM_VNDK_VERSION is set" 2017-12-26 01:51:20 +00:00
bohu
93ac3b81eb emulator: add check_emu_boot.mk, again
"make check_emu_boot" will boot up emulator
and check whether it boots up or timed out.
On boot success, it will emit a file
BOOT_SUCCESS.txt in dist_dir;
On timed out, it will emit a file
BOOT_FAIL.txt in dist_dir

original cl breaks some build, and this
fixes it by incorporating the following cl

https://android-review.googlesource.com/c/platform/build/+/576282

Test: choosecombo 1 aosp_arm64_ab userdebug
      m -j checkbuild tests

Test: make check_emu_boot
Change-Id: I09cba4f8fde672f9ea685dee1c0c108f2c457e2a
2017-12-22 17:51:38 +00:00