Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a7886dc4 authored by Simran Basi's avatar Simran Basi Committed by android-build-merger
Browse files

Merge "Add device-tests and general-tests make targets." am: c436f9ee am: 0d0f7e1c 

am: c1eb9a69

Change-Id: I6288642e2dcfa7210605030e968dae4122c8deb6
parents 472055ee c1eb9a69

core/main.mk

+4 −0
Original line number Diff line number Diff line
@@ -90,6 +90,10 @@ endif 
-include cts/build/config.mk

# VTS-specific config.

-include test/vts/tools/vts-tradefed/build/config.mk

# device-tests-specific-config.

-include tools/tradefederation/build/suites/device-tests/config.mk

# general-tests-specific-config.

-include tools/tradefederation/build/suites/general-tests/config.mk



# This allows us to force a clean build - included after the config.mk

# environment setup is done, but before we generate any dependencies.  This

core/tasks/device-tests.mk

0 → 100644
+17 −0
Original line number Diff line number Diff line 
# Copyright (C) 2017 The Android Open Source Project

#

# Licensed under the Apache License, Version 2.0 (the "License");

# you may not use this file except in compliance with the License.

# You may obtain a copy of the License at

#

#      http://www.apache.org/licenses/LICENSE-2.0

#

# Unless required by applicable law or agrls eed to in writing, software

# distributed under the License is distributed on an "AS IS" BASIS,

# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

# See the License for the specific language governing permissions and

# limitations under the License.





.PHONY: device-tests

device-tests: $(COMPATIBILITY.device-tests.FILES)

core/tasks/general-tests.mk

0 → 100644
+16 −0
Original line number Diff line number Diff line 
# Copyright (C) 2017 The Android Open Source Project

#

# Licensed under the Apache License, Version 2.0 (the "License");

# you may not use this file except in compliance with the License.

# You may obtain a copy of the License at

#

#      http://www.apache.org/licenses/LICENSE-2.0

#

# Unless required by applicable law or agrls eed to in writing, software

# distributed under the License is distributed on an "AS IS" BASIS,

# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

# See the License for the specific language governing permissions and

# limitations under the License.



.PHONY: general-tests

device-tests: $(COMPATIBILITY.general-tests.FILES)