Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Koptxx #256

Open
wants to merge 148 commits into
base: aosp
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
148 commits
Select commit Hold shift + click to select a range
4c38e0a
remove test source
tranleduy2000 Jun 6, 2018
fa43e19
remove unit test variant
tranleduy2000 Jun 6, 2018
dfde893
remove test source
tranleduy2000 Jun 6, 2018
6cd21f5
remove complete renderscript
tranleduy2000 Jun 6, 2018
447d028
Remove Embed Micro App
tranleduy2000 Jun 6, 2018
83a1ac3
cleanup
tranleduy2000 Jun 6, 2018
7c2391a
remove incremental task
tranleduy2000 Jun 6, 2018
c5ff175
cleanup
tranleduy2000 Jun 6, 2018
34393de
remove GenerateApkDataTask.java
tranleduy2000 Jun 6, 2018
154dd2a
cleanup
tranleduy2000 Jun 6, 2018
870ca7f
clean dex options
tranleduy2000 Jun 6, 2018
c78262e
cleanup
tranleduy2000 Jun 6, 2018
662ac7d
fake sdk folder
tranleduy2000 Jun 6, 2018
0292977
cleanup
tranleduy2000 Jun 6, 2018
07ba2b5
cleanup
tranleduy2000 Jun 6, 2018
c8b06fc
cleanup
tranleduy2000 Jun 6, 2018
2c1a4a4
cleanup
tranleduy2000 Jun 6, 2018
e0fbfa6
format source
tranleduy2000 Jun 6, 2018
eb204cf
test simple project, failed
tranleduy2000 Jun 6, 2018
e0cc96e
cleanup
tranleduy2000 Jun 6, 2018
c1d0d45
lint project
tranleduy2000 Jun 6, 2018
93f1c15
clean adb source code
tranleduy2000 Jun 6, 2018
78fe0a6
cleanup
tranleduy2000 Jun 6, 2018
39c9cf5
remove gdb, never support
tranleduy2000 Jun 6, 2018
f1085a7
remove ndk
tranleduy2000 Jun 7, 2018
ca144ff
convert some groovy file to java
tranleduy2000 Jun 7, 2018
9779761
update build tools
tranleduy2000 Jun 8, 2018
0ccb6d3
lib-n-ide-release.aar
tranleduy2000 Jun 8, 2018
1f35406
remove module file-explorer
tranleduy2000 Jun 8, 2018
5a1a904
update gradle script
tranleduy2000 Jun 8, 2018
bf6074d
Change theme
tranleduy2000 Jun 8, 2018
bc1384d
refactor code
tranleduy2000 Jun 8, 2018
690a133
cleanup
tranleduy2000 Jun 8, 2018
e15cbc1
refactor code
tranleduy2000 Jun 8, 2018
344e0bc
cleanup
tranleduy2000 Jun 8, 2018
99ffe95
cleanup
tranleduy2000 Jun 8, 2018
8e188cf
try to clean up
tranleduy2000 Jun 8, 2018
6832ae4
cleanup and refactor
tranleduy2000 Jun 8, 2018
ec7ea85
implements lib-n-ide-release.aar
tranleduy2000 Jun 8, 2018
0449d6b
implements lib-n-ide-release.aar
tranleduy2000 Jun 8, 2018
ebb6169
cleanup
tranleduy2000 Jun 8, 2018
e87ee83
cleanup resource
tranleduy2000 Jun 8, 2018
57f7ba9
implement ide activity and cleanup
tranleduy2000 Jun 8, 2018
8db0d95
fix not show folder, add menu
tranleduy2000 Jun 8, 2018
b7c03c3
cleanup and refactor
tranleduy2000 Jun 9, 2018
37fc3ea
cleanup and refactor
tranleduy2000 Jun 9, 2018
8832a58
Change default theme
tranleduy2000 Jun 9, 2018
a95600b
menu files and menu navigation
tranleduy2000 Jun 9, 2018
df0853f
remove keyboard
tranleduy2000 Jun 9, 2018
005a4f4
cleanup resource using lint
tranleduy2000 Jun 9, 2018
ecb82fe
Move java format options to preference_compiler.xml
tranleduy2000 Jun 9, 2018
1c2b6f4
default font system
tranleduy2000 Jun 9, 2018
e896722
Improve create new class dialog
tranleduy2000 Jun 9, 2018
c6561f2
group menu "new" and "open"
tranleduy2000 Jun 9, 2018
5204793
remove std filter when program finished
tranleduy2000 Jun 9, 2018
3a24125
clean menu file
tranleduy2000 Jun 9, 2018
2388288
improve dialog new file
tranleduy2000 Jun 9, 2018
c786d42
aapt parser
tranleduy2000 Jun 9, 2018
ef237f3
Improve DialogNewJavaProject.java
tranleduy2000 Jun 9, 2018
dc0b04c
set parser for diagnostic
tranleduy2000 Jun 9, 2018
3d49716
Display project name
tranleduy2000 Jun 9, 2018
d120cdf
cleanup
tranleduy2000 Jun 9, 2018
31085c2
Fixed java output parser not display files
tranleduy2000 Jun 9, 2018
0553835
cleanup
tranleduy2000 Jun 9, 2018
fb3dd1b
cleanup
tranleduy2000 Jun 9, 2018
0a69028
cleanup
tranleduy2000 Jun 9, 2018
2e63e20
Update menu, cleanup
tranleduy2000 Jun 9, 2018
2636c38
cleanup
tranleduy2000 Jun 10, 2018
f59de95
Improve UI, change height java sample
tranleduy2000 Jun 10, 2018
456ddb5
Implements file action for folder structure fragment
tranleduy2000 Jun 10, 2018
7afa8b1
cleanup
tranleduy2000 Jun 10, 2018
332fa4a
Improve dialog new android resource
tranleduy2000 Jun 10, 2018
573467c
Improve folder view
tranleduy2000 Jun 10, 2018
78dd813
cleanup
tranleduy2000 Jun 10, 2018
39411fa
cleanup
tranleduy2000 Jun 10, 2018
81ad1ee
remove module style
tranleduy2000 Jun 10, 2018
3cdf1be
cleanup and refactor
tranleduy2000 Jun 10, 2018
687b8ca
refactor code
tranleduy2000 Jun 10, 2018
81dc6d6
update n ide library
tranleduy2000 Jun 10, 2018
0ef29fc
Show suggestion when type
tranleduy2000 Jun 10, 2018
5b30582
Improve auto complete, more OPP
tranleduy2000 Jun 11, 2018
692e1be
Fix not import class when select constructor
tranleduy2000 Jun 11, 2018
a57e5c9
complete package
tranleduy2000 Jun 11, 2018
b25fb6f
Insert package
tranleduy2000 Jun 11, 2018
3149b7a
Complete package working perfect
tranleduy2000 Jun 11, 2018
1870640
update copyright GNU GPL 3.0
tranleduy2000 Jun 11, 2018
33f2e59
refactor code, add LICENSE
tranleduy2000 Jun 11, 2018
7ca55cd
Display ClassDescription.java with package name
tranleduy2000 Jun 11, 2018
121a1cc
Show parameter type in ConstructorDescription.java
tranleduy2000 Jun 11, 2018
aba1e18
Only show value of primitive types, handle select FieldDescription.java
tranleduy2000 Jun 11, 2018
543405c
New java auto complete algorithm
tranleduy2000 Jun 11, 2018
f8b6371
CompleteString.java: suggest when method of string class
tranleduy2000 Jun 11, 2018
5dded17
Complete package
tranleduy2000 Jun 11, 2018
a9b2597
CompletePackage.java
tranleduy2000 Jun 11, 2018
d41046b
Auto complete keyword
tranleduy2000 Jun 11, 2018
831e3b3
Improve compete new keyword
tranleduy2000 Jun 11, 2018
ee12c8f
Improve get statement
tranleduy2000 Jun 11, 2018
6751050
CompleteClassDeclared working perfect
tranleduy2000 Jun 11, 2018
c6dbad8
improve CompleteClassDeclared
tranleduy2000 Jun 11, 2018
9e5da1e
CompleteThisKeyword.java
tranleduy2000 Jun 11, 2018
a616b5a
refactor code
tranleduy2000 Jun 11, 2018
1d87c28
complete word
tranleduy2000 Jun 12, 2018
cd2e315
remove complete keyword, add complete word(class, keyword)
tranleduy2000 Jun 12, 2018
d8c806d
Improve complete word
tranleduy2000 Jun 12, 2018
e5d14a9
Resolve expression at cursor, perfect and exactly by using JavaParser
tranleduy2000 Jun 12, 2018
4715fdb
extract expression success
tranleduy2000 Jun 12, 2018
633bcb3
singleton JavaClassReader
tranleduy2000 Jun 12, 2018
15e03d5
lazy init member avoid infinity loop
tranleduy2000 Jun 12, 2018
a70aff3
improve get field
tranleduy2000 Jun 12, 2018
39e19fe
Now, complete expression working with method invocation
tranleduy2000 Jun 12, 2018
0b31d92
Display params in suggest popup
tranleduy2000 Jun 12, 2018
00bef56
improve display field for more readable
tranleduy2000 Jun 12, 2018
10b0f3c
refactor code
tranleduy2000 Jun 13, 2018
85f86c7
Add vartype as an expression
tranleduy2000 Jun 13, 2018
b95c204
complete field access, fix inf loop
tranleduy2000 Jun 13, 2018
d5062b7
refactor code
tranleduy2000 Jun 13, 2018
0f71912
use IClass
tranleduy2000 Jun 13, 2018
04f807f
improve import: do not import java.lang package
tranleduy2000 Jun 13, 2018
28a87f4
support complete array access
tranleduy2000 Jun 13, 2018
fea1361
Import resolve type, try to find static class
tranleduy2000 Jun 13, 2018
d00e327
improve select void method
tranleduy2000 Jun 13, 2018
3ef572e
accept non static method
tranleduy2000 Jun 13, 2018
4143c1a
Resolve exactly part of expression, such as (i < variable), the expre…
tranleduy2000 Jun 13, 2018
7e1b583
refactor code
tranleduy2000 Jun 13, 2018
55c82d0
fixed set wrong info
tranleduy2000 Jun 13, 2018
f26191d
update lib n-ide
tranleduy2000 Jun 13, 2018
3d66829
cleanup
tranleduy2000 Jun 13, 2018
b621208
clean, fix missing method
tranleduy2000 Jun 13, 2018
2bbcf8c
improve find variable declaration
tranleduy2000 Jun 14, 2018
de27dd8
try to parse typing class, parse methods
tranleduy2000 Jun 14, 2018
ec12b5c
parse class and put it to database, now auto complete working with us…
tranleduy2000 Jun 14, 2018
e70a05a
set super class for class
tranleduy2000 Jun 14, 2018
24a759b
improve UI
tranleduy2000 Jun 14, 2018
7f62369
format sample code
tranleduy2000 Jun 14, 2018
bc7f97c
Fixed class def not found
tranleduy2000 Jun 15, 2018
c7736bf
Fixed not save theme, change theme when activity finish.
tranleduy2000 Jun 15, 2018
ac7f280
Fixed can not select file from storage
tranleduy2000 Jun 15, 2018
23283dc
Fixed crash Fatal Exception: java.lang.NullPointerException
tranleduy2000 Jun 15, 2018
761b9cd
Fixed crash when create new project on API < 19
tranleduy2000 Jun 15, 2018
5b5ad96
remove common io dependencies, it cause crash because using new api
tranleduy2000 Jun 15, 2018
b7aea3e
remove common io dependencies, it cause crash because using new api
tranleduy2000 Jun 15, 2018
62627b4
refactor code: move to other package
tranleduy2000 Jun 15, 2018
33cc1bd
refactor code
tranleduy2000 Jun 15, 2018
2776fdc
Dialog jar config: select main class and custom attrs
tranleduy2000 Jun 15, 2018
6f8542e
Create build jar task
tranleduy2000 Jun 15, 2018
c7c8d97
Build jar complete
tranleduy2000 Jun 15, 2018
c6186e1
run jar dialog
tranleduy2000 Jun 15, 2018
fddee3e
Lib java decompiler
tranleduy2000 Jun 15, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ captures/

# External native build folder generated in Android Studio 2.2 and later
.externalNativeBuild

signing.properties

# Freeline
freeline.py
Expand All @@ -64,3 +64,4 @@ freeline_project_description.json
!/lib-android-compiler/src/main/java/com/android/build/
!/aosp/gradle-experimental/src/main/java/com/android/build/
/txt.java
!**/src/*
18 changes: 18 additions & 0 deletions IncompleteSource.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
package com.duy.ide.javaide.editor.autocomplete.parser;

class IncompleteSource {
int var1;
long var2;

void m1() {
var1
}

void m2() {
var2
}

void m3() {
var3 sa
}
}
674 changes: 674 additions & 0 deletions LICENSE

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion androidlogcat/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ apply plugin: 'com.android.library'

android {
compileSdkVersion rootProject.ext.compileSdkVersion
buildToolsVersion rootProject.ext.buildToolsVersion

defaultConfig {
minSdkVersion rootProject.ext.minSdkVersion
Expand All @@ -18,6 +17,7 @@ android {
}
}
dataBinding.enabled = true
buildToolsVersion '27.0.3'
}


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ public static class SettingsFragment extends PreferenceFragment implements OnPre
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
addPreferencesFromResource(R.xml.logcat_settings);
addPreferencesFromResource(R.xml.preference_logcat);

setUpPreferences();
}
Expand Down
8 changes: 0 additions & 8 deletions androidlogcat/src/main/res/drawable/shadow.xml

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
2 changes: 0 additions & 2 deletions androidlogcat/src/main/res/values-xlarge/dimens.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,4 @@

<dimen name="log_level_width">20dp</dimen>

<dimen name="main_button_height">60dp</dimen>
<dimen name="main_button_width">65dp</dimen>
</resources>
5 changes: 0 additions & 5 deletions androidlogcat/src/main/res/values/arrays.xml
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,6 @@
<item>@string/pref_theme_choice_tmobile_name</item>
</string-array>

<string-array name="filter_choices">
<item>@string/filter_choice_tag</item>
<item>@string/filter_choice_pid</item>
</string-array>

<string-array name="log_levels">
<item>@string/log_level_verbose</item>
<item>@string/log_level_debug</item>
Expand Down
16 changes: 0 additions & 16 deletions androidlogcat/src/main/res/values/colors.xml
Original file line number Diff line number Diff line change
@@ -1,19 +1,6 @@
<resources>

<color name="imageBackground">#DDFFFFFF</color>
<color name="imageBorder">#FF333333</color>

<color name="orange1">#FFf26700</color>
<color name="orange2">#FFff9000</color>
<color name="yellow1">#FFfbad00</color>
<color name="yellow2">#FFffc600</color>

<color name="action_bar_start">#FFFBFBFB</color>
<color name="action_bar_end">#FFCCCCCC</color>

<color name="linkColorBlue">#0099dd</color>

<color name="dark_divider">#33cccccc</color>

<color name="background_wtf">#FF999900</color>
<color name="background_error">#FFCC0000</color>
Expand All @@ -37,7 +24,6 @@
<color name="main_background_sprint">#FF000000</color>
<color name="main_background_tmobile">#FFeaeff3</color>

<color name="main_foreground_dark">@android:color/darker_gray</color>
<color name="main_foreground_light">@android:color/black</color>
<color name="main_foreground_android">@android:color/black</color>
<color name="main_foreground_verizon">#FFed1f24</color>
Expand Down Expand Up @@ -115,8 +101,6 @@
<color name="android_theme_tag_color_16">#FFCC3399</color>
<color name="android_theme_tag_color_17">#FFFFCC00</color>

<color name="primary">#F44336</color>
<color name="primary_dark">#D32F2F</color>
<color name="accent">#448AFF</color>


Expand Down
3 changes: 0 additions & 3 deletions androidlogcat/src/main/res/values/dimens.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,5 @@
<dimen name="tag_width">70dp</dimen>
<dimen name="pid_width">85dp</dimen>

<dimen name="main_button_height">47dp</dimen>
<dimen name="main_button_width">52dp</dimen>

<dimen name="fab_compat_margin">0dp</dimen>
</resources>
4 changes: 1 addition & 3 deletions androidlogcat/src/main/res/values/ic_launcher_background.xml
Original file line number Diff line number Diff line change
@@ -1,4 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="ic_launcher_background">#607D8B</color>
</resources>
<resources></resources>
19 changes: 0 additions & 19 deletions androidlogcat/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
<string name="log_level_warn">Warn</string>
<string name="log_level_wtf">What a Terrible Failure</string>

<string name="pref_about">about</string>
<string name="pref_buffer">buffer</string>
<string name="pref_buffer_choice_events_value">events</string>
<string name="pref_buffer_choice_main_value">main</string>
Expand Down Expand Up @@ -72,7 +71,6 @@
<string name="delete_saved_log">Delete Saved Logs</string>
<string name="delimiter">, </string>
<string name="dialog_compiling_log">Compiling log…</string>
<string name="dialog_for_widget">For a <b>widget</b>,\ndo Home → Long\npress → Widgets</string>
<string name="dialog_initializing_recorder">Loading recorder…</string>
<string name="dialog_loading_updates">Loading updates…</string>
<string name="dialog_partial_select_explanation">1. Select the <b>first</b> line.\n2. Then select the <b>last</b> line.</string>
Expand All @@ -91,18 +89,12 @@
<string name="filter_choice_tag">Tag</string>
<string name="filter_text_colon">Filter text:</string>

<string name="first_run_pref_summary">Show introductory message again.</string>
<string name="first_run_pref_title">Reset Introduction</string>
<string name="first_run_title">Welcome to log cat!</string>

<string name="log_cleared">Logs cleared</string>
<string name="log_level">Log Level</string>
<string name="log_level_colon">Log level:</string>
<string name="log_recording_started">Log recording started.</string>
<string name="log_saved">Log saved.</string>

<string name="main_edit_text_hint">Search logs</string>

<string name="manage_saved_logs">Manage Saved Logs</string>

<string name="menu_title_partial_select">Save Partial</string>
Expand Down Expand Up @@ -143,13 +135,9 @@
<string name="pref_theme_choice_sprint_name">Big Yellow</string>
<string name="pref_theme_choice_tmobile_name">T-Mo</string>
<string name="pref_theme_choice_verizon_name">Big Red</string>
<string name="pref_theme_summary_free">Requires donate version.</string>
<string name="pref_theme_title">Color Scheme</string>

<string name="record_log">Record Log</string>

<string name="recording_in_progress">Recording already in progress.</string>

<string name="save">Save</string>
<string name="save_as">Save As…</string>
<string name="save_log">Save Log</string>
Expand All @@ -158,8 +146,6 @@

<string name="select_logs_to_delete">Select which logs to delete.</string>

<string name="send_as_attachment">Send as Attachment</string>
<string name="send_as_text">Send as Text</string>
<string name="send_log">Send</string>
<string name="send_log_title">Send Log</string>

Expand All @@ -169,8 +155,6 @@

<string name="start_recording_log">Record</string>

<string name="stop_recording_log">Stop Recording</string>

<string name="subject_log_report">Log report</string>

<string name="text_filter_ellipsis">Filter…</string>
Expand All @@ -194,15 +178,12 @@
<item quantity="other">Log too large; showing last %d lines.</item>
</plurals>

<string name="toast_no_root">Could not obtain root. You will only see own logs.</string>
<string name="toast_pref_changed_restart_required">Setting updated. Restart app to see the changes.</string>
<string name="toast_request_root">Logcat requires root (superuser) access to read logs.</string>
<string name="toast_started_select_partial">Select Partial mode enabled</string>

<string name="unable_to_save_log">Unable to save log. Did you enter a valid filename?</string>

<string name="version">Version %s</string>

<string name="widget_recording_in_progress">Recording…</string>
<string name="widget_start_recording">Record\nLog</string>
<string name="as_text_not_work">\"As text\" may not work due to the large amount of characters. Please try \"As attachment\"</string>
Expand Down
13 changes: 0 additions & 13 deletions androidlogcat/src/main/res/values/styles.xml
Original file line number Diff line number Diff line change
@@ -1,16 +1,3 @@
<resources>

<style name="Theme.MatLog.AlertDialog" parent="@style/Theme.AppCompat.Dialog.Alert">
<item name="colorPrimary">@color/primary</item>
<item name="colorPrimaryDark">@color/primary_dark</item>
<item name="colorAccent">@color/accent</item>

<item name="android:colorPrimary">@color/primary</item>
<item name="android:colorPrimaryDark">@color/primary_dark</item>
<item name="android:colorAccent">@color/accent</item>

<item name="windowActionBar">false</item>
<item name="windowNoTitle">true</item>
</style>

</resources>

This file was deleted.

3 changes: 1 addition & 2 deletions aosp/annotations/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.duy.aosp.annotations" />
<manifest package="com.duy.aosp.annotations" />
1 change: 0 additions & 1 deletion aosp/build-system/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ integration-test/samples/basic/lint-report*
integration-test/samples/dependencies/jarProject/build
integration-test/samples/dependencies/jarProject2/build
integration-test/samples/embedded/*/build
integration-test/samples/embedded/micro-apps/*/build
integration-test/samples/flavoredlib/*/build
integration-test/samples/flavorlib/*/build
integration-test/samples/libMinifyJarDep/*/build
Expand Down
6 changes: 0 additions & 6 deletions aosp/build-system/changelog.txt
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,6 @@
- Enhanced manifest merger logging by specifying library coordinates.
- Allow manifest placeholder to be of any type as long as toString() is implemented.
- Fixed issue where a library with a low targetSdk would add permissions due to a declared permission in a different manifest.
- Better fix for issue where embedding a micro app could add new permissions to the main app manifest.
- Added check for conflict between density splits and resConfig property.
- test applications are now not using multi-dexing, unless they test a library project.
- Fixed lint issues 80872, 80834, 60416, 80837
Expand All @@ -140,7 +139,6 @@
- Density split using aapt 21+ now use --preferred-density allowing for missing density version of some bitmaps.
- hasProperty() will now work again on read-only wrapper returned by the variant API.
- Setting applicationId(Suffix) in a Library project will now properly fail.
- Fixed issue where embedding a micro app could add new permissions to the main app manifest.

0.14.3
- Variant Specific BuildConfigField/resValue
Expand Down Expand Up @@ -184,7 +182,6 @@
0.14.1
- Fix coverage support.
- Fix resource shrinking for style references
- Exclude embedded Wear micro-app from resource shrinking.

0.14.0
- Proguard and code coverage can now work together
Expand All @@ -203,9 +200,6 @@
- BuildType.runProguard -> minifyEnabled
- BuildType.zipAlign -> zipAlignEnabled
- BuildType.jniDebugBuild -> jniDebuggable
- BuildType.renderscriptDebug -> renderscriptDebuggable
- ProductFlavor.renderscriptSupportMode -> renderscriptSupportModeEnabled
- ProductFlavor.renderscriptNdkMode -> renderscriptNdkModeEnabled
* BuildType/ProductFlavor/SigningConfig queried through the variant and variantFilter API are now read-only.
- These objects have always been global and changing them would have side effects in other variants
- Merged flavor is still per-variant and can me modified
Expand Down
44 changes: 22 additions & 22 deletions aosp/build-system/docs/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -71,16 +71,16 @@ dependencies {

userGuideStyleSheets 'docbook:docbook-xsl:1.75.2@zip'

fonts \
"lato:regular:6:v0SdcGFAl2aezM9Vq_aFTQ@ttf",
"lato:regular-italic:6:LqowQDslGv4DmUBAfWa2Vw@ttf",
"lato:bold:6:DvlFBScY1r-FMtZSYIYoYw@ttf",
"lato:bold-italic:6:HkF_qI1x_noxlxhrhMQYEKCWcynf_cDxXwCLxiixG1c@ttf",
"roboto:regular:14:zN7GBFwfMP4uA6AR0HCoLQ@ttf",
"ubuntumono:regular:3:ViZhet7Ak-LRXZMXzuAfkZ0EAVxt0G0biEntp43Qt6E@ttf",
"ubuntumono:regular-italic:3:KAKuHXAHZOeECOWAHsRKA-LrC4Du4e_yfTJ8Ol60xk0@ttf",
"ubuntumono:bold:3:ceqTZGKHipo8pJj4molytp_TkvowlIOtbR7ePgFOpF4@ttf",
"ubuntumono:bold-italic:3:n_d8tv_JOIiYyMXR4eaV9WsGzsqhEorxQDpu60nfWEc@ttf"
fonts \
"lato:regular:6:v0SdcGFAl2aezM9Vq_aFTQ@ttf",
"lato:regular-italic:6:LqowQDslGv4DmUBAfWa2Vw@ttf",
"lato:bold:6:DvlFBScY1r-FMtZSYIYoYw@ttf",
"lato:bold-italic:6:HkF_qI1x_noxlxhrhMQYEKCWcynf_cDxXwCLxiixG1c@ttf",
"roboto:regular:14:zN7GBFwfMP4uA6AR0HCoLQ@ttf",
"ubuntumono:regular:3:ViZhet7Ak-LRXZMXzuAfkZ0EAVxt0G0biEntp43Qt6E@ttf",
"ubuntumono:regular-italic:3:KAKuHXAHZOeECOWAHsRKA-LrC4Du4e_yfTJ8Ol60xk0@ttf",
"ubuntumono:bold:3:ceqTZGKHipo8pJj4molytp_TkvowlIOtbR7ePgFOpF4@ttf",
"ubuntumono:bold-italic:3:n_d8tv_JOIiYyMXR4eaV9WsGzsqhEorxQDpu60nfWEc@ttf"

groovydocGroovy 'org.codehaus.groovy:groovy-all:2.3.6'

Expand Down Expand Up @@ -122,9 +122,9 @@ tasks.withType(UserGuideTransformTask) {

if (name in ["pdfUserguideDocbook", "userguideFragmentSrc"]) {
// These will only be valid for releases, but that's ok
javadocUrl = "http://www.gradle.org/docs/${->version}/javadoc"
groovydocUrl = "http://www.gradle.org/docs/${->version}/groovydoc"
dsldocUrl = "http://www.gradle.org/docs/${->version}/dsl"
javadocUrl = "http://www.gradle.org/docs/${-> version}/javadoc"
groovydocUrl = "http://www.gradle.org/docs/${-> version}/groovydoc"
dsldocUrl = "http://www.gradle.org/docs/${-> version}/dsl"
} else {
javadocUrl = '../javadoc'
groovydocUrl = '../groovydoc'
Expand Down Expand Up @@ -233,10 +233,10 @@ task dslHtml(type: Docbook2Xhtml) {
}

task dslHtmlZip(type: Zip) {
dependsOn dslHtml
from dslHtml.destDir
destinationDir docsDir
baseName 'gradle-dsl'
dependsOn dslHtml
from dslHtml.destDir
destinationDir docsDir
baseName 'gradle-dsl'
}

def javaApiUrl = "http://docs.oracle.com/javase/1.6.0/docs/api/"
Expand All @@ -259,17 +259,17 @@ task javadocAll(type: Javadoc) {
options.addStringOption 'Xdoclint:none', '-quiet'
}
// options.addStringOption "stylesheetfile", stylesheetFile.absolutePath
source publicGroovyProjects.collect {project -> project.sourceSets.main.allJava }
source publicGroovyProjects.collect { project -> project.sourceSets.main.allJava }
destinationDir = new File(docsDir, 'javadoc')
classpath = files(publicGroovyProjects.collect {project -> [project.sourceSets.main.compileClasspath, project.sourceSets.main.output] })
classpath = files(publicGroovyProjects.collect { project -> [project.sourceSets.main.compileClasspath, project.sourceSets.main.output] })
// include 'org/gradle/*'
// include 'org/gradle/api/**'
include 'com/android/build/gradle/**'
include 'com/android/build/gradle/internal/dsl/**'
include 'com/android/builder/**'
// exclude '**/internal/**'
options.links(javaApiUrl, groovyApiUrl, "http://maven.apache.org/ref/2.2.1/maven-core/apidocs",
"http://maven.apache.org/ref/2.2.1/maven-model/apidocs")
"http://maven.apache.org/ref/2.2.1/maven-model/apidocs")
doFirst {
title = "Android plugin API $version"
}
Expand All @@ -290,7 +290,7 @@ task configureGroovydocAll {

task groovydocAll(type: Groovydoc, dependsOn: configureGroovydocAll) {
group = 'documentation'
source publicGroovyProjects.collect {project ->
source publicGroovyProjects.collect { project ->
def main = project.sourceSets.main
try {
main.groovy + main.java
Expand All @@ -302,7 +302,7 @@ task groovydocAll(type: Groovydoc, dependsOn: configureGroovydocAll) {

// Groovydoc runs static initializers, and at least ProjectBuilder's initializers depend on runtime classes
// http://jira.codehaus.org/browse/GROOVY-7096
classpath = files(publicGroovyProjects.collect {project -> [project.sourceSets.main.runtimeClasspath, project.sourceSets.main.output] })
classpath = files(publicGroovyProjects.collect { project -> [project.sourceSets.main.runtimeClasspath, project.sourceSets.main.output] })

includes = javadocAll.includes
excludes = javadocAll.excludes
Expand Down
Loading