Commit Graph

25940 Commits

Author SHA1 Message Date
Treehugger Robot
4b03e176a6 Merge "Set fullpath for script" 2019-08-02 01:59:07 +00:00
Jeongik Cha
697461a975 Set fullpath for script
compare_images -> out/host/linux-x86/bin/compare_images
lunch before compare_image because it didn't find llvm_strip

Bug: 138639389
Test: development/vndk/tools/image-diff-tool/compare_images_and_print.sh "-t path1 path2 -s SYSTEM -i"
Change-Id: I3cce8710470ebc8827aeaae75ac42da880ad9df2
2019-08-01 23:38:20 +09:00
Treehugger Robot
34445d5083 Merge "Add script for running diff easily" 2019-07-31 15:21:28 +00:00
Jeongik Cha
574b9d3b83 Add script for running diff easily
For convenient diff test in post-submit, write a script.

Bug: 138639389
Test: development/vndk/tools/image-diff-tool/compare_images_and_print.sh "-t path1 path2 -s SYSTEM -i"

Change-Id: Ia7e1f7fb7f22bd2a53028e0e65458b7c1adc53bd
2019-07-31 21:44:15 +09:00
Joshua Gilpatrick
995770b91c Merge "Remove fastdeploy agent files" 2019-07-30 21:51:57 +00:00
Joshua Gilpatrick
8b36def7bd Remove fastdeploy agent files
These files are now embeded into the binary and pushed as needed.
Test: None
Bug: 138130943
Change-Id: Icda72bf674ceb8ab7971110723af3458881b4618
2019-07-29 10:06:00 -07:00
Treehugger Robot
b33008068f Merge "Refactor compare_images" 2019-07-26 01:45:44 +00:00
Jeongik Cha
b68408275b Refactor compare_images
1. Rename some variables to more detail
2. Fix a bug that occurs when system.img contains product, system_ext
3. Remove multithread code, it made performance worse :(
  before: 136.97s user 1070.22s system 290% cpu 6:55.84 total
  after:  56.29s user 76.95s system 105% cpu 2:06.84 total

Bug: 138329983
Test: compare some images, and check if result is same as before
Change-Id: I4cec27475283a34d063ad3251cfc5909c34071c1
2019-07-25 19:14:20 +09:00
Treehugger Robot
996f9b13a0 Merge "Remove emacs scripts" 2019-07-18 23:52:43 +00:00
Dan Willemsen
c607646faa Remove emacs scripts
These haven't been touched in nearly 10 years, and make assumptions
about the build system that are either no longer true, or will no longer
be true soon.

Test: treehugger
Change-Id: I8bed2f9a7644f559e82b6958a783875089af2c2e
2019-07-18 14:07:39 -07:00
Tao Bao
b240e319df Merge "Add the product id for recovery (D001)." 2019-07-18 15:59:01 +00:00
Jeffrey Vander Stoep
a8cd634bf0 Merge "Renderscript: rename .rs extension to .rscript" 2019-07-18 02:02:00 +00:00
Jeff Vander Stoep
426027aac2 Renderscript: rename .rs extension to .rscript
Reserve .rs extension for Rust.

Bug: 137365032
Test: make checkbuild
Test: cd frameworks/compile/slang/tests
    ./slang_tests.py
Test: atest CtsRenderscriptTestCases
Test: CtsRsCppTestCases

Change-Id: Iab077f256ff3776495302606572f384d82ab171f
Merged-In: Iab077f256ff3776495302606572f384d82ab171f
2019-07-17 21:34:36 +00:00
Josh Gao
909d140f26 Merge "Update platform tools version to 29.0.2." 2019-07-17 20:27:07 +00:00
Josh Gao
87897453a1 Update platform tools version to 29.0.2.
Bug: http://b/137409211
Bug: http://b/137729568
Test: none
Change-Id: If21e5e15c5fb3d7701993c7f0ba3ee51c5e42ead
2019-07-17 13:11:16 -07:00
Tao Bao
ad06f1194d Add the product id for recovery (D001).
recovery uses its own product id of D001, for adb/sideload/resuce modes.

Bug: 136716811
Test: Install the (unsigned) driver on Windows 7. `adb devices` shows a
      device under recovery mode (adb/sideload/rescue).
Change-Id: Ie7526644825c400c9e2b3a9daa9fb93ae8ed00b1
2019-07-16 13:00:04 -07:00
Treehugger Robot
08ac866859 Merge "Rename tool's name" 2019-07-16 08:57:44 +00:00
Jeongik Cha
30c0f1ede6 Rename tool's name
system_product_image_diff -> compare_images

it has more general options, so change its name more general

Bug: 131273025
Test: m
Change-Id: I7579f01edb9f8b8f2fe727b405a592b9c6217eb4
2019-07-16 15:10:12 +09:00
Treehugger Robot
5732e8c827 Merge "Add --ignore_signing_key option in compare tool" 2019-07-16 03:46:49 +00:00
Jeongik Cha
5864907380 Add --ignore_signing_key option in compare tool
Even though some apps has identical contents(code, resource), they looks
different from each other if signing keys are different.

So, for efficiency, add --ignore_signing_key option in compare tool.
If it is set, sha1sum logic is changed.
As-is: sha1sum apk_file
To-be: add every sha1sum of files that are in apk_file except META-INF,
and then get sha1sum from sha1sums

Bug: 135503972
Test: compare two apk of which code and resource is same but signing key
is diffent.

Change-Id: I2176fdfce5f0fc2181073a1a1183c51dfbfaee49
2019-07-12 22:40:03 +09:00
Treehugger Robot
f82839906c Merge "Rename product_services to system_ext" 2019-07-10 04:30:08 +00:00
Justin Yun
1a2cf1097f Rename product_services to system_ext
Bug: 134359158
Test: N/A
Change-Id: I1183558c003db923827df867d287bababa35d8b9
2019-07-09 23:34:43 +00:00
Xin Li
c894ae29e2 Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master" 2019-07-09 21:38:48 +00:00
Xin Li
f257eed44b DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master
Bug: 136196576
Change-Id: I16a949662a107bcc1070e6c0f5bbf18a04235458
2019-07-09 11:23:40 -07:00
android-build-team Robot
8ef31cb46b Snap for 5622519 from 2398594234 to pi-platform-release
Change-Id: Ie4a8206bfedcf2c64b45adffe877cd4ca91a3717
2019-07-08 23:20:48 +00:00
Treehugger Robot
a1d3b9d995 Merge changes I85f52bd3,Ia91262e4,Ie084d288,I693815ff,If696d330, ...
* changes:
  WinScope: Support missing layers
  Winscope: Fix how layers with transforms and positions are rendered
  WinScope: Modify instead of replacing proto objects
  Support SF traces without any layers (needed when booting SF)
  Winscope: Translate layer flags in Surface flinger dump
  Update `Display default` checkbox label
  Add Type to transform objects.
  Fix visibility rule for SF traces on Winscope
  Allow SF traces to omit default values on the property list
  Fix "TypeError: Cannot read property 'x' of null" on SF traces
  Display only elements actually visible on the screen as "Visible"
  Display SF layer based on size, crop & parent instead of buffer size
  WinScope: Support boundless surfaces in WinScope
  Winscope: Use a unique stableId for all layers and wm entries
  Winscope: keep backwards compatibility prior to windowFrames
2019-07-02 13:58:25 +00:00
Treehugger Robot
f9d35cf89e Merge "Use windowFrames.frame instead of frame to draw the area." 2019-06-28 18:10:28 +00:00
Treehugger Robot
2f7f18d495 Merge "Winscope: fix .pb location for sf traces" 2019-06-28 17:18:35 +00:00
Treehugger Robot
a37de64bd6 Merge "Clarify license terms for Romain Guy's artwork." 2019-06-28 02:05:46 +00:00
Bob Badour
e72c60e885 Clarify license terms for Romain Guy's artwork.
As discussed with Romain Guy in the email thread, the Apache 2.0
license applies to the affected .jpg files now and retroactively from
the time of import.

Usage terms updated using exiftool:

$ exiftool -UsageTerms='Apache License Version 2.0' \
    development/samples/ApiDemos/res/drawable-nodpi/frantic.jpg
Warning: [minor] Fixed incorrect list type for XMP-xmpRights:UsageTerms - development/samples/ApiDemos/res/drawable-nodpi/frantic.jpg
    1 image files updated
$ exiftool -URL -WebStatement -UsageTerms -Rights -Creator \
    development/samples/ApiDemos/res/drawable-nodpi/frantic.jpg
Usage Terms                     : Apache License Version 2.0
Rights                          : Romain Guy
Creator                         : Romain Guy
$ exiftool -UsageTerms='Apache License Version 2.0' \
    development/samples/devbytes/animation/PictureViewer/res/drawable-nodpi/p3.jpg
    1 image files updated
$ exiftool -URL -WebStatement -UsageTerms -Rights -Creator \
    development/samples/devbytes/animation/PictureViewer/res/drawable-nodpi/p3.jpg
Usage Terms                     : Apache License Version 2.0
Rights                          : Romain Guy
Creator                         : Romain Guy
$ exiftool -UsageTerms='Apache License Version 2.0' \
    development/samples/devbytes/animation/PictureViewer/res/drawable-nodpi/p2.jpg
    1 image files updated
$ exiftool -URL -WebStatement -UsageTerms -Rights -Creator \
    development/samples/devbytes/animation/PictureViewer/res/drawable-nodpi/p2.jpg
Usage Terms                     : Apache License Version 2.0
Rights                          : Romain Guy
Creator                         : Romain Guy
$ exiftool -UsageTerms='Apache License Version 2.0' \
    development/samples/devbytes/animation/ActivityAnimations/res/drawable-nodpi/p3.jpg
    1 image files updated
$ exiftool -URL -WebStatement -UsageTerms -Rights -Creator \
    development/samples/devbytes/animation/ActivityAnimations/res/drawable-nodpi/p3.jpg
Usage Terms                     : Apache License Version 2.0
Rights                          : Romain Guy
Creator                         : Romain Guy
$ exiftool -UsageTerms='Apache License Version 2.0' \
    development/samples/devbytes/animation/ActivityAnimations/res/drawable-nodpi/p2.jpg
    1 image files updated
$ exiftool -URL -WebStatement -UsageTerms -Rights -Creator \
    development/samples/devbytes/animation/ActivityAnimations/res/drawable-nodpi/p2.jpg
Usage Terms                     : Apache License Version 2.0
Rights                          : Romain Guy
Creator                         : Romain Guy

Test: doesn't realy apply to images

Change-Id: If060c6ba0f0279e3a7e6446061d50cd8e4cdec3c
2019-06-27 14:58:10 -07:00
Alexander Smundak
1ccb28f28a Merge "Convert Android.mk files to Android.bp" 2019-06-27 15:25:37 +00:00
Treehugger Robot
456ccff485 Merge "Winscope: apply surface transforms in preview" 2019-06-26 19:01:47 +00:00
Sasha Smundak
bef01b9173 Convert Android.mk files to Android.bp
See build/soong/README.md for more information.

Bug: 122332515
Test: treehugger
Change-Id: I0f6ae8d880114d1bc83f7aac2b96eafef76dc046
2019-06-25 14:18:16 -07:00
Treehugger Robot
38379147fa Merge "WinScope: Show IME windows" 2019-06-25 16:52:57 +00:00
Treehugger Robot
acf69cc766 Merge "WinScope: Properly show child windows." 2019-06-25 16:10:24 +00:00
Hsin-Yi Chen
df6ed868b9 Merge "Generate lsdump without sdump" 2019-06-25 02:11:56 +00:00
Hsin-Yi Chen
da5b477770 Generate lsdump without sdump
This commit changes <dump-files> to be an optional parameter for
header-abi-linker. The linker can generate lsdump files for libraries
without source files.

Test: ./test.py
Test: ./create_reference_dumps.py -products aosp_arm64
Bug: 135728451
Change-Id: Ib9fe56591bd476921904118b1bafcdf2e987f8bb
2019-06-24 14:13:35 +08:00
Treehugger Robot
9958d0da90 Merge "Remove unused import of ServiceManagerNative." 2019-06-22 07:18:30 +00:00
Steven Moreland
bdc5faa067 Remove unused import of ServiceManagerNative.
Bug: 135768100
Test: N/A
Change-Id: Ieb11d0a7b083ba2518047596241d31887f81a916
2019-06-21 15:37:20 -07:00
Treehugger Robot
e65b3cc324 Merge "system and product image diff tool" 2019-06-18 17:34:31 +00:00
Vishnu Nair
b5568bfcc8 WinScope: Support missing layers
The new sf layer transform changes breaks when missing layers are added since they do not contain transform
data. Fix this is by adding a transform when creating missing layers.

Also set the transform type when populating transform matrices so they are displayed as IDENTITY.

Test: Open trace from bug
Fixes: 130886882
Merged-In: I85f52bd3dc9174499c4a4840c6b5e80555f28fc7
Change-Id: I85f52bd3dc9174499c4a4840c6b5e80555f28fc7
2019-06-18 12:59:15 +00:00
Vishnu Nair
7f45d5d5ec Winscope: Fix how layers with transforms and positions are rendered
Currently position is applied to the layer bounds before applying the transform. The bounds
are also not bounded by parent bounds.

Change the logic to use the calculated layer bounds and apply the transform with position when
rendering the layer on screen.
Keep existing logic to view traces before layer bounds were added.

Bug: 128925841
Test: open winscope with old (P) and new trace (Q ToT). Check if layers are rendered correctly when rotated.
Merged-In: Ia91262e4dfe3e8ad647acf8e0cf961e270441cde
Change-Id: Ia91262e4dfe3e8ad647acf8e0cf961e270441cde
2019-06-18 12:59:07 +00:00
Vishnu Nair
47c7571f0b WinScope: Modify instead of replacing proto objects
Converting the proto object inorder to set the enum string values
or display default values replaces existing proto objects and its
properties which maybe used by the formatter function.

Instead replace toObject method with a custom one that limits
modifications to the existing proto objects.

Test: run WinScope and check WM and SF traces

Merged-In: Ie084d288aaf569476f1e9284c3a9c8a06364a61a
Change-Id: Ie084d288aaf569476f1e9284c3a9c8a06364a61a
2019-06-18 12:58:28 +00:00
Nataniel Borges
4e524b0b78 Support SF traces without any layers (needed when booting SF)
When using continuous logging and having the trace enabled by default,
the first entries have no layers and crash Winscope.

Test: Flash a device with SF tracing enabled by default. Record the
initial trace. Open trace in Winscope.

Merged-In: I693815ff3e6468291770d3e8197e21bf75a2a87a
Change-Id: I693815ff3e6468291770d3e8197e21bf75a2a87a
2019-06-18 12:58:09 +00:00
Vishnu Nair
5c006d104a Winscope: Translate layer flags in Surface flinger dump
Test: Open sf trace and check if flags are translated
Fixes: 127436444
Merged-In: If696d33054ae566d209b769427f5681d4e1ff876
Change-Id: If696d33054ae566d209b769427f5681d4e1ff876
2019-06-18 12:58:02 +00:00
Nataniel Borges
d122ad83ff Update Display default checkbox label
Replace label for `Show default properties` and add tooltip explaining
what this checkbox is used for

Test: Open winscope
Merged-In: I39de3e1d7c203d5273084bd54c4d2f749e8e6f5f
Change-Id: I39de3e1d7c203d5273084bd54c4d2f749e8e6f5f
2019-06-18 12:57:56 +00:00
Nataniel Borges
7f63847ec5 Add Type to transform objects.
Add a type, based on the framework/native definitions, to the transform
objects.

If the transform matrix can be reconstructed from the type (identity,
translate, rotate 0/90/180/270) it should not be stored on the protobuf,
but should instead be reconstructed on Winscope.

Test: Record a Proto3 SF trace. Open it without displaying default
values in Winscope. Check if it is correct. Select a legacy trace. Open
it in Winscope. Check is it is also correct.

Merged-In: I03744efba2c8740d7c543f6793bce0ba7bf6d975
Change-Id: I03744efba2c8740d7c543f6793bce0ba7bf6d975
2019-06-18 12:57:47 +00:00
Nataniel Borges
eacb719985 Fix visibility rule for SF traces on Winscope
When traces don't have a visible region object assigned winscope crashes
while loading a SF trace.

Test: Open a SF trace without a visible region object on winscope. It
should no longer crash

Merged-In: I7919a0301ccfb6a0811fd15feb718c8ac0b210b1
Change-Id: I7919a0301ccfb6a0811fd15feb718c8ac0b210b1
2019-06-18 12:57:40 +00:00
Nataniel Borges
f1e0f50a01 Allow SF traces to omit default values on the property list
The C++ proto2 implementation write the default values ot the file.
Until the surface flinger dump is updated to proto3, this implementation
will not have any effect.

Test: (Un)Check the `display defaults` checkbox. Load a file. If the
checkbox is unchecked, default values should not appear on winscope,
otherwise they should appear.

Merged-In: I2432966f3e14aba5fc1dee26d5a09c743406b417
Change-Id: I2432966f3e14aba5fc1dee26d5a09c743406b417
2019-06-18 12:57:33 +00:00
Nataniel Borges
10ef665c58 Fix "TypeError: Cannot read property 'x' of null" on SF traces
The protobuf definition allows the position attribute not to be defined.
Winscope crashes if the position is not defined, instead of assuming it
as (x: 0, y: 0)

Test: Load a SF protobuf object without the position attribute. Check if
Winscope does't crash while loading it.

Merged-In: Ib12ba7875f1e7b22819274c1cd9961a1dbfe82cf
Change-Id: Ib12ba7875f1e7b22819274c1cd9961a1dbfe82cf
2019-06-18 12:57:26 +00:00