| Age | Commit message (Collapse) | Author |
|---|
|
Gradle projects, especially those migrated from Eclipse contain
overlapping source sets for different source types. e.g.:
java.srcDirs = ['src']
aidl.srcDirs = ['src']
resources.srcDirs = ['src', 'resources']
Currently, this will show up as separate nodes (java, aidl and resources),
with all of them showing the sources within their source folders. This
is not only odd, but causes issues where the navigator would expand multiple
nodes seemingly randomly when expanding a particular node. This happens
because we have a single folder present in multiple locations inside
the tree.
This CL improves this scenario by:
- If the source roots for a particular source type is a subset of
a previously shown source type's roots, then we just don't show
this source type. e.g. in the above case, we don't show aidl at
all since it is completely present inside java.
- If the set of source roots is an improper subset, we only show
those folders that have not already been shown. In the above example,
for resources, we only show the contents of the 'resources' folder
and not the 'src' folder.
Fixes https://code.google.com/p/android/issues/detail?id=74243 and
https://code.google.com/p/android/issues/detail?id=73928
Change-Id: I4a9c056e96096d6bf29239e5da41fca1746eb70e
|
|
jniLibs was already part of the SourceProvider interface, but not
IdeaSourceProvider.
Fixes https://code.google.com/p/android/issues/detail?id=74068
Change-Id: Ic39b093ef98df25598f49f915bc314ea5281666a
|
|
Android instrumentation test sources are provided as part of
an extra source set. This CL incorporates those source sets when
computing the list of files to the Android Navigator view.
Currently, the test sources are actually merged along with
the regular sources. In a future CL, we can investigate making
this an option (possibly pulling out the tests and all source types
to be a separate node).
Fixes https://code.google.com/p/android/issues/detail?id=74063
Change-Id: I93c7ef15af98e05c96bd15a6ed85f47bf843bc2b
|
|
Minor fixes per previous code reviews.
Change-Id: I5190d168faa2a60acd4035a02f91e30c2c1fc8b7
|
|
The res node shows a logical structure of the applications
resources. This simplifies the on-disk structure in a few
ways:
- like all other nodes in the Android View, it incorporates
all the resources from all source providers
- Rather than including all the different folders in res,
it only shows unqualified folder types at the top level.
e.g. rather than values-fr and values, it only shows values.
- The qualifiers (such as -fr) are all pushed down to the
individual resource. So if there are multiple alternatives
for a resource that differs in qualifiers, then they are
all grouped under a single resource node.
Change-Id: Ib3b07ef7694870821b7bbc5d7833e5a4ba867830
|
|
Change-Id: I6e29e1ad51f05c4b395184fa5672174592712291
|
|
For testing purposes, we need to deploy a test version of the newest
gradle plugin to a staging server. This change adds a check to all
buildscript.repositories {} closures which checks for the presence
of the environment variable MAVEN_URL which can point to a staging
maven repository.
Change-Id: I755c5973e806d1fee9cdf82c16215713da7b6b5e
|
|
|
|
Updates gradle plugin version for testData to the newest.
Change-Id: Ifb8dbd4dca8c6ad8979c6e9b0b4acc7c590cb3f3
|
|
Updates plugin names in generated build.gradle files to match the
changes in https://android-review.googlesource.com/#/c/98106/
Change-Id: I6c83b84104310cb9fdc86898d805870d5b314eb1
|
|
First, this updates the unit test runner which loads and builds the
Gradle unit test projects such that it searches through the build.gradle
files in the project and replaces older dependencies (of the Gradle
plugin, and of the buildToolsVersion) with the minimum requirements.
This means that we don't have to go and update all the unit test
projects every time we rev the requirements.
It will also insert a custom Maven URL if set via the android.mavenRepoUrl
system property, which lets you run unit tests against a dev version
of the Android plugin.
Finally I did update the various metadata files manually since we've
gotten rid of the packageName methods; this avoids build warnings
about APIs going away. While I was at it I bumped the versions too;
this isn't necessary given that the project loader above will replace
them on the fly, but since I've changed the schema I thought it best
to make the projects directly loadable in Studio as well.
Change-Id: Ib88437ed8a7ade540d3f5b6705984f423c63d924
|
|
This CL fixes a bunch of issues in the package view for
Gradle based Android projects. See
https://code.google.com/p/android/issues/detail?id=68832
for a list of issues.
In particular, in the packages view, the node representing
a module is replaced with a new node, called the AndroidModuleNode.
This node simply overrides the existing package view node for a
module to add some categorization for different source types (the
existing view does not distinguish between java or res, it treats
everything under a source root as a java package).
Manifest files weren't displayed in the package view earlier since
they were outside a source root, but they are displayed now.
Just like the existing package view, the update view also does
not display files that are not in an active source root i.e. files
not enabled for the current variant aren't displayed.
Change-Id: I47d21b5776f40f874b958b99d39c97147e29918a
|
