Commit Graph

3985 Commits

Author SHA1 Message Date
Chih-Hung Hsieh
e819d01e3e Fix misc-macro-parentheses warnings in aapt and androidfw.
Bug: 28705665
Change-Id: Iac353e66718aadad384183cf300330695df25909
2016-05-19 15:19:22 -07:00
Adam Lesinski
da66fa7526 Merge "AAPT: ProGuard config for components in main dex." 2016-04-28 20:06:19 +00:00
Chih-Hung Hsieh
c6baf563ba Fix google-explicit-constructor warnings.
Bug: 28341362
Change-Id: Ibdd6a210bb7ff228e3624cc319169f77aca3b51e
2016-04-27 11:38:12 -07:00
Rohit Agrawal
6ba873faec AAPT: ProGuard config for components in main dex.
Create an analogue of "aapt -G" which outputs a proguard configuration
that keeps only components which need to be in the main dex.

BUG: 27383099

Change-Id: Ic18c8c563794ff27a5598a214111d1b446a005f1
(cherry picked from commit 86229cb622)
2016-04-27 11:26:55 -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
Neil Fuller
8658378382 Merge "Change libraries needed by layoutlib to "host" libs"
am: 709bf582cf

* commit '709bf582cf949680da976e3f6cd5bf03396b1db1':
  Change libraries needed by layoutlib to "host" libs
2016-03-04 13:03:48 +00:00
Neil Fuller
709bf582cf Merge "Change libraries needed by layoutlib to "host" libs" 2016-03-04 12:58:45 +00:00
Neil Fuller
dd24c58f1a Change libraries needed by layoutlib to "host" libs
They are only used on host and are one of the few places
in the build that use LOCAL_JACK_ENABLED := disabled.

Bug: 27218410
(cherry picked from commit d34e33bc83)

Change-Id: I8febfca41b3e9baaf290e53ca1449254d4cc9b46
2016-03-04 12:01:49 +00:00
Deepanshu Gupta
00b594e5bc Merge changes from topic \'java_8_layoutlib\'
am: 5d5fd21e0a

* commit '5d5fd21e0aa23662d513825a5054b3b3970b3118':
  Switch LayoutLib to Java 8
  Move LayoutLib to Java 8
2016-02-29 10:37:16 +00:00
Neil Fuller
5d5fd21e0a Merge changes from topic 'java_8_layoutlib'
* changes:
  Switch LayoutLib to Java 8
  Move LayoutLib to Java 8
2016-02-29 10:33:29 +00:00
Andreas Gampe
dcb4956ad1 Merge "Preload2: Fix object to sync on"
am: de38445284

* commit 'de384452846c1f84ce9d88b470f0ca5129446055':
  Preload2: Fix object to sync on
2016-02-22 18:11:00 +00:00
Deepanshu Gupta
fda1ace261 Switch LayoutLib to Java 8
The main build hasn't swtiched to java 8, but lambdas are already used
in layoutlib. This fixes the build break.

(cherry picked from commit 7914e4ca03)

Change-Id: Ice5741dcb8b93faf739a3c21f2ed8be95f92ad08
2016-02-22 17:53:37 +00:00
Deepanshu Gupta
c6e35f2e65 Move LayoutLib to Java 8
Partial cherry-pick of commit 491523d52c

Change-Id: Ic64fb20a00ba2ca8b3016f548222729e3f009e9f
2016-02-22 17:49:18 +00:00
Andreas Gampe
f2a9933fa7 Preload2: Fix object to sync on
When moving to sync on the right objects, these waits() have been
forgotten.

Change-Id: I61b0d3c5cc41b7f46fbdd3099ec44221e653001a
2016-02-19 09:24:43 -08:00
Neil Fuller
6b6d8426fe Fix a bad merge
There was a bad interaction between
commits 6777f54fa4
and 23e47f5621.

Change-Id: Ic408f8b4859d83d89c612748ee6e772b57830d96
2016-02-19 16:50:14 +00:00
Bill Yi
2528fcdfbd Merge commit '26ada7e78993241d702a908eae93d174cbb3c8b3' into HEAD
Change-Id: Ifc45930160cf01ee78ecfbfdc48697055f82e0a7
2016-02-17 11:38:55 -08:00
Deepanshu Gupta
e96ffcfd50 Java 8 in layoutlib-create
Upgrade to ASM 5 and diamond operators.

Also minor fixes here and there.

Bug: 26442940

(cherry picked from commit 23e47f5621)

Change-Id: I770d80626ef7a7b8cba82ce2c5fbc54c8874bc6b
2016-02-09 19:14:10 -08:00
Deepanshu Gupta
4f3d0c6caa Remove GregorianCalendar hack
Bug: http://b.android.com/199424
Change-Id: I589d153e1f57b6302c6fe3c031c5c63e33ad9996
2016-01-22 11:33:53 -08:00
Dan Albert
2edfa8c9b0 Merge "Make the appropriate cast to protect from mingw."
am: dbf8c17bd2

* commit 'dbf8c17bd20c3c5b4ba99242afa8b714841914d1':
  Make the appropriate cast to protect from mingw.
2016-01-15 21:02:29 +00:00
Dan Albert
ed811eeaea Make the appropriate cast to protect from mingw.
As the comment at the top of the file says:

    STATUST: mingw does seem to redefine UNKNOWN_ERROR from our enum
    value, so a cast is necessary.

Bug: http://b/26523949
Change-Id: I9d86cafdc47bbb9ce0e967cdde9315babc083432
2016-01-15 12:16:06 -08:00
Andreas Gampe
f2eb8b236f Merge "Frameworks/base: New preload tool"
am: f2c7983de1

* commit 'f2c7983de141d008c7c02e3331fbde67e13ac46c':
  Frameworks/base: New preload tool
2016-01-08 17:44:54 +00:00
Andreas Gampe
f2c7983de1 Merge "Frameworks/base: New preload tool" 2016-01-08 17:35:45 +00:00
Andreas Gampe
554d7ee0f5 Frameworks/base: New preload tool
Add a new preload tool based on hprof dumps. This means that only
a userdebug build (to adjust the pre-existing preloaded-classes
file) is required now, not a recompiled runtime.

Change-Id: Ib0c00de3b248e49fa8271cbace67c5d4a50170a1
2016-01-08 09:25:15 -08:00
Alex Klyubin
4a06b7ea7e Merge "[1/3] Remove unnecessary throws statement in ServiceManager"
am: d1240219aa

* commit 'd1240219aadedc867b50158c67d1737a27fa7c6f':
  [1/3] Remove unnecessary throws statement in ServiceManager
2016-01-07 19:18:01 +00:00
Umair Khan
9ccebbfc37 [1/3] Remove unnecessary throws statement in ServiceManager
The exception is already caught by the try-catch block.

Change-Id: I0c10fe51d12a10cbc02a25c719d03a4ba6497767
Signed-off-by: Umair Khan <omerjerk@gmail.com>
2016-01-07 15:08:27 +05:30
Narayan Kamath
f59c02a65e Merge changes from topic \'aosp-merge-24-12\'
am: e0e81bf407

* commit 'e0e81bf407508ec096c752948f8794af5fd480ca':
  Special case system_server to not create the JIT code cache.
  Don't use IntegralToString
  Track libcore commit 85d69e16fe1e59e50c1ad228e754abf325088362.
  Track API changes to java.lang.ref.Reference.
  Remove merge markers from preloaded-classes
  Move StrictJarFile from libcore to framework
  Switch RecoverySystem impl to use sun.security.pkcs
  API update for OpenJdk based libcore
  Use libcore/known_oj_tags for the javadoc stage.
  Stop preloading fortress classes
  Use HexDump instead of java.lang.IntegralToString
  Add core-oj to the list of core library jars.
2015-12-24 04:07:42 -08:00
Piotr Jastrzebski
62ed63185c Add core-oj to the list of core library jars.
With some core classes moved to separate core-oj jar
we need to use the new jar.

(cherry picked from commit cfa292e1da)

Change-Id: Iba481c3df029902a2bd0f9661d0819f4a191b2aa
2015-12-22 13:10:55 +00:00
Adam Lesinski
087e0fcba6 DO NOT MERGE: AAPT: Dump uses-permission-sdk-23 am: b2c5155638 am: 40d1ab91d2 am: 8c9209183f am: 7f5ad22330
am: 1f7a36b8e6

* commit '1f7a36b8e6aa55dcb22a63c250fb318260ac349f':
  DO NOT MERGE: AAPT: Dump uses-permission-sdk-23
2015-12-16 23:44:25 +00:00
Adam Lesinski
1f7a36b8e6 DO NOT MERGE: AAPT: Dump uses-permission-sdk-23 am: b2c5155638 am: 40d1ab91d2 am: 8c9209183f
am: 7f5ad22330

* commit '7f5ad223306a482bdf33d213971af041e9fba590':
  DO NOT MERGE: AAPT: Dump uses-permission-sdk-23
2015-12-16 23:35:17 +00:00
Adam Lesinski
7f5ad22330 DO NOT MERGE: AAPT: Dump uses-permission-sdk-23 am: b2c5155638 am: 40d1ab91d2
am: 8c9209183f

* commit '8c9209183fa67953bebe1adb5dfb529c1b6273f0':
  DO NOT MERGE: AAPT: Dump uses-permission-sdk-23
2015-12-16 23:25:45 +00:00
Adam Lesinski
b2c5155638 DO NOT MERGE: AAPT: Dump uses-permission-sdk-23
Include <uses-permission-sdk-23> permissions in dump badging and dump permissions.

This will also add implied features for that permission, marked as -sdk-23 features.

Ex:

uses-permission: name='android.permission.ACCESS_FINE_LOCATION'
uses-permission-sdk-23: name='android.permission.CAMERA'

feature-group: label=''
  uses-feature: name='android.hardware.location'
  uses-implied-feature: name='android.hardware.location' reason='...'
  uses-feature-sdk-23: name='android.hardware.camera'
  uses-implied-feature-sdk-23: name='android.hardware.camera' reason='...'

Bug:24939655
Change-Id: Ifb374696ed4760b0ba2f1cc3516f3bf08e6cb6a3
(cherry picked from commit 5f3b2ecb3e)
2015-12-16 22:43:07 +00:00
Elliott Hughes
7e7047ea0a Merge "Track rename from base/ to android-base/." am: 9f6a2ae67c
am: 8aa8fe2c64

* commit '8aa8fe2c64cf4611ba68d90992e54858a35aae58':
  Track rename from base/ to android-base/.
2015-12-05 01:44:41 +00:00
Elliott Hughes
8aa8fe2c64 Merge "Track rename from base/ to android-base/."
am: 9f6a2ae67c

* commit '9f6a2ae67c70085d550962829e6bfe76706907d8':
  Track rename from base/ to android-base/.
2015-12-05 01:36:53 +00:00
Elliott Hughes
be5474da4b Track rename from base/ to android-base/.
Change-Id: I31be831de812052d1c0d4c0781178d0756124bcf
2015-12-04 15:33:35 -08:00
Deepanshu Gupta
adca23bb4c Merge "Revert "Revert "Update StaticLayout_Delegate to use new nLoadHyphenator""" into mnc-ub-dev am: 35f7562495 am: 2d887558df
am: 0627cd0c40

* commit '0627cd0c404838a0251ee359ed75041f430fa83b':
  Revert "Revert "Update StaticLayout_Delegate to use new nLoadHyphenator""
2015-11-20 01:55:01 +00:00
Deepanshu Gupta
138a901db4 Merge "Revert "Update StaticLayout_Delegate to use new nLoadHyphenator"" into mnc-ub-dev am: 8c971ae5a0 am: 867c370465
am: 4d9df358ec

* commit '4d9df358ec847262872c09962105537be350f8fd':
  Revert "Update StaticLayout_Delegate to use new nLoadHyphenator"
2015-11-20 01:53:43 +00:00
Deepanshu Gupta
0627cd0c40 Merge "Revert "Revert "Update StaticLayout_Delegate to use new nLoadHyphenator""" into mnc-ub-dev am: 35f7562495
am: 2d887558df

* commit '2d887558dfa0b46fde5663fb494e2230febeaccc':
  Revert "Revert "Update StaticLayout_Delegate to use new nLoadHyphenator""
2015-11-19 21:10:57 +00:00
Deepanshu Gupta
4d9df358ec Merge "Revert "Update StaticLayout_Delegate to use new nLoadHyphenator"" into mnc-ub-dev am: 8c971ae5a0
am: 867c370465

* commit '867c3704652d40118b47e9c97149e7fd9567a16b':
  Revert "Update StaticLayout_Delegate to use new nLoadHyphenator"
2015-11-19 21:09:24 +00:00
Deepanshu Gupta
35f7562495 Merge "Revert "Revert "Update StaticLayout_Delegate to use new nLoadHyphenator""" into mnc-ub-dev 2015-11-19 20:49:55 +00:00
Deepanshu Gupta
66098964e2 Revert "Revert "Update StaticLayout_Delegate to use new nLoadHyphenator""
This reverts commit 65a834980c.


The original revert was only for cherry-pick to release
branch.

Change-Id: Ib78f9a06ce49681c767f65b262058f18a670e38e
2015-11-19 20:49:35 +00:00
Deepanshu Gupta
8c971ae5a0 Merge "Revert "Update StaticLayout_Delegate to use new nLoadHyphenator"" into mnc-ub-dev 2015-11-19 20:48:52 +00:00
Deepanshu Gupta
65a834980c Revert "Update StaticLayout_Delegate to use new nLoadHyphenator"
This reverts commit 631c2ffd6f.

The revert is only for cherry-pick back to mnc-sdk-release.

Change-Id: I42cb392528b7890b58d689c732f90c3b9ba5f74c
2015-11-19 20:47:26 +00:00
Alex Deymo
8d31b08904 Merge "Remove the aidl tool" into mnc-dr2-dev 2015-11-18 16:39:09 +00:00
Diego Perez
f9281b6dfe Merge "Fix delegation of methods within inner static classes" into mnc-ub-dev am: 603544d4c4 am: 14a826380d
am: 0b76d094c6

* commit '0b76d094c6e121f21135d851e4ee6ce8b6ee625f':
  Fix delegation of methods within inner static classes
2015-11-18 00:13:20 +00:00
Diego Perez
603544d4c4 Merge "Fix delegation of methods within inner static classes" into mnc-ub-dev 2015-11-17 22:34:08 +00:00
Deepanshu Gupta
377cc4887d Revert "LayoutLib: Fix true transparency in status bar."
am: 4ea74d2960

* commit '4ea74d2960688db6aa13452765dd5f2d07a40189':
  Revert "LayoutLib: Fix true transparency in status bar."
2015-11-17 20:50:07 +00:00
Deepanshu Gupta
dd97829cf2 Merge "AppCompatActionBar: use findClass to test presence" into mnc-ub-dev
am: 42a893b50b

* commit '42a893b50b2763d7a2a3da4006c9433afaf86cfd':
  AppCompatActionBar: use findClass to test presence
2015-11-17 20:32:31 +00:00
Deepanshu Gupta
4ea74d2960 Revert "LayoutLib: Fix true transparency in status bar."
This reverts commit 4eb298a941.

Even though this is techinically closer to what the framework does, the
fix is not complete. As a result, it looks worse when using AppCompat
themes. Revert the change for the release.

Change-Id: I67c1002ea17dee7234d78e2d13aab876467bd70f
2015-11-17 12:25:25 -08:00
Deepanshu Gupta
42a893b50b Merge "AppCompatActionBar: use findClass to test presence" into mnc-ub-dev 2015-11-17 20:22:43 +00:00
Deepanshu Gupta
ab45fc1a4f LayoutLib: IntelliJ changed project files.
am: 22931224d9

* commit '22931224d9a9845d316a9ea30e56557bec0b2e45':
  LayoutLib: IntelliJ changed project files.
2015-11-17 19:54:06 +00:00