drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
277,220 Commits 1 Branch 0 Tags
Commit Graph

12 Commits

Author SHA1 Message Date
Paul Duffin
ccb0445027 Prepare for removal of legacy-test from default targets 
In preparation for removing junit classes from the Android API
the legacy-test target will be removed from the
TARGET_DEFAULT_JAVA_LIBRARIES. This change adds explicit
dependencies on junit and/or legacy-android-test to ensure that
modules will compile properly once it is removed.

(cherry picked from 6387604f9e672ece85e07c4bcbd7be396867f06f)

Bug: 30188076
Test: make checkbuild
Merged-In: I13e88297731253420e4e5f5291d503f13a39a156
Change-Id: I58446eb8c45d8ac2bcdbc9fa40d1321e811bdd4b
 2017-01-19 09:43:05 +00:00
Paul Duffin
9249205d1b Replace core-junit with junit 
Bug: 30188076
Test: make checkbuild
Change-Id: I0cb6f89907eb099714b54bac57b51c4be186c3e0
 2016-12-06 14:32:41 +00:00
Allen Hair
79f42608c2 Merge "Deprecate shell-based UI Automator." into nyc-dev 
am: f298f4a7c7

* commit 'f298f4a7c779588821b744c7247fc896541cae57':
  Deprecate shell-based UI Automator.

Change-Id: I0f8f99ddc4dd1048a84ab9f6f7edc19d923c7a75
 2016-05-24 21:36:20 +00:00
Allen Hair
3fb03313e9 Deprecate shell-based UI Automator. 
Change-Id: I15aee7a6aba551b737d2c41b4fafd5b0ced9a4b7
 2016-05-24 11:10:44 -07:00
Dan Willemsen
dc3b852125 resolve merge conflicts of 8416096 to nyc-dev-plus-aosp 
Change-Id: I1638601fe84dda01bf52c59eb6c976bc1fe37498
 2016-03-23 15:31:32 -07:00
Dan Willemsen
98ff0b72f0 Remove custom copy rules, stop using ACP 
Replace some custom rules with BUILD_PREBUILT.

Move tools from ALL_PREBUILTS to BUILD_PREBUILT. All of them are already
in PRODUCT_PACKAGES in build/target/product/base.mk.

Remove uses of ACP and replace with core build system macros or 'cp'

Change-Id: I529e7c6c50fc64ad36b75bb47142f6bde909d141
 2016-03-23 13:42:52 -07:00
Dianne Hackborn
4a18c26609 Fix issue #27385109: control activity behavior without triggering... 
...isUserAMonkey for testing purpose

Add an argument for the caller to specify if they are a poo flinging
monkey.

Change-Id: I0e149a8d78776abaf07517bd4ae886047b7f4252
 2016-02-29 12:37:11 -08:00
Xiaohui Chen
bd0e03bb76 More USER_OWNER cleanup. 
Bug: 19913735
Change-Id: I408a92d9dbab2a096407efccb91e2a8bdc22714d
 2015-08-24 16:42:37 +00:00
Ying Wang
0f92a2e72f Using LOCAL_DROIDDOC_STUB_OUT_DIR to specify "-stubs" option. 
So that the build system can clean up the stub out dir before
calling doclava.

Bug: 22534021
Change-Id: Iba33cf0a295e4ae32fdcad8bd326c2f52de5f875
 2015-07-16 14:20:22 -07:00
Doris Liu
adb8921453 Clean up calls to Rect.intersect() 
This CL checks for the return value for Rect.intersect() for whether
there is actually an intersection before taking the return intersected
rect. In the case of no intersection (Rect.intersect() returns false),
an empty rect will be used as the intersection.

bug: 7368679
Change-Id: Ibda3bfd662f8ca83cb5662748d9be250243b72b2
 2015-05-28 15:39:05 -07:00
Guang Zhu
0d09166a68 Reapply: Add generated source dependency for Jack compilation. 
Original change:
frameworks/testing 04af616aeba3a4e57b32092afe763981d1776dc8

Change reapplied due to source location move

Bug: 18708851
Change-Id: I2c220194aa94af528767c123f6fa34b623ce73d4
 2014-12-13 23:09:56 -08:00
Guang Zhu
18b892c723 shell based UI Automator source move 
frameworks/testing/uiautomator -> frameworks/base/cmds/uiautomator
  (samples, utils sub folders exlcuded)
frameworks/testing/uiautomator/utils -> frameworks/base/tests/utils

no source files changed, only one line makefile update (for
UI Automator API check)

Bug: 18708851
Change-Id: I396bd386d3d55a52df18af183685daf80caa9f73
 2014-12-12 17:31:38 -08:00