-
Notifications
You must be signed in to change notification settings - Fork 4.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Export proguard specs from aar_import
**Background** #3778 proguard specs from the `aar_import` rule do not get bubbled up to `android_binary`. In this PR, I wire up a `ProguardSpecProvider` from this rule that exports the `proguard.txt` within an AAR if it exists and any transitive proguard specs from the `exports` attribute. **Changes** * Add an `aar_embedded_proguard_extractor` script to extract `proguard.txt` from an AAR if it exists otherwise generate an empty proguard specs file * In AarImport, wire up the proguard extractor action and export results through a `ProguardSpecProvider`. Once this lands, the android rules would need to be bumped. **Test Plan** * Added tests for the extraction python script * Added tests for the `aar_import` rule changes Closes #12749. PiperOrigin-RevId: 359667674
- Loading branch information
1 parent
f917dc1
commit c8c0d94
Showing
9 changed files
with
249 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,76 @@ | ||
# Lint as: python2, python3 | ||
# pylint: disable=g-direct-third-party-import | ||
# Copyright 2021 The Bazel Authors. All rights reserved. | ||
# | ||
# Licensed under the Apache License, Version 2.0 (the "License"); | ||
# you may not use this file except in compliance with the License. | ||
# You may obtain a copy of the License at | ||
# | ||
# http://www.apache.org/licenses/LICENSE-2.0 | ||
# | ||
# Unless required by applicable law or agreed to in writing, software | ||
# distributed under the License is distributed on an "AS IS" BASIS, | ||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
# See the License for the specific language governing permissions and | ||
# limitations under the License. | ||
"""A tool for extracting the proguard spec file from an AAR.""" | ||
|
||
from __future__ import absolute_import | ||
from __future__ import division | ||
from __future__ import print_function | ||
|
||
import os | ||
import sys | ||
import zipfile | ||
|
||
# Do not edit this line. Copybara replaces it with PY2 migration helper. | ||
from absl import app | ||
from absl import flags | ||
|
||
from tools.android import junction | ||
|
||
FLAGS = flags.FLAGS | ||
|
||
flags.DEFINE_string("input_aar", None, "Input AAR") | ||
flags.mark_flag_as_required("input_aar") | ||
flags.DEFINE_string("output_proguard_file", None, | ||
"Output parameter file for proguard") | ||
flags.mark_flag_as_required("output_proguard_file") | ||
|
||
|
||
# Attempt to extract proguard spec from AAR. If the file doesn't exist, an empty | ||
# proguard spec file will be created | ||
def ExtractEmbeddedProguard(aar, output): | ||
proguard_spec = "proguard.txt" | ||
|
||
if proguard_spec in aar.namelist(): | ||
output.write(aar.read(proguard_spec)) | ||
|
||
|
||
def _Main(input_aar, output_proguard_file): | ||
with zipfile.ZipFile(input_aar, "r") as aar: | ||
with open(output_proguard_file, "wb") as output: | ||
ExtractEmbeddedProguard(aar, output) | ||
|
||
|
||
def main(unused_argv): | ||
if os.name == "nt": | ||
# Shorten paths unconditionally, because the extracted paths in | ||
# ExtractEmbeddedJars (which we cannot yet predict, because they depend on | ||
# the names of the Zip entries) may be longer than MAX_PATH. | ||
aar_long = os.path.abspath(FLAGS.input_aar) | ||
proguard_long = os.path.abspath(FLAGS.output_proguard_file) | ||
|
||
with junction.TempJunction(os.path.dirname(aar_long)) as aar_junc: | ||
with junction.TempJunction( | ||
os.path.dirname(proguard_long)) as proguard_junc: | ||
_Main( | ||
os.path.join(aar_junc, os.path.basename(aar_long)), | ||
os.path.join(proguard_junc, os.path.basename(proguard_long))) | ||
else: | ||
_Main(FLAGS.input_aar, FLAGS.output_proguard_file) | ||
|
||
|
||
if __name__ == "__main__": | ||
FLAGS(sys.argv) | ||
app.run(main) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,54 @@ | ||
# Copyright 2021 The Bazel Authors. All rights reserved. | ||
# | ||
# Licensed under the Apache License, Version 2.0 (the "License"); | ||
# you may not use this file except in compliance with the License. | ||
# You may obtain a copy of the License at | ||
# | ||
# http://www.apache.org/licenses/LICENSE-2.0 | ||
# | ||
# Unless required by applicable law or agreed to in writing, software | ||
# distributed under the License is distributed on an "AS IS" BASIS, | ||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
# See the License for the specific language governing permissions and | ||
# limitations under the License. | ||
"""Tests for aar_embedded_proguard_extractor.""" | ||
|
||
import io | ||
import os | ||
import unittest | ||
import zipfile | ||
|
||
from tools.android import aar_embedded_proguard_extractor | ||
|
||
|
||
class AarEmbeddedProguardExtractor(unittest.TestCase): | ||
"""Unit tests for aar_embedded_proguard_extractor.py.""" | ||
|
||
# Python 2 alias | ||
if not hasattr(unittest.TestCase, "assertCountEqual"): | ||
|
||
def assertCountEqual(self, *args): | ||
return self.assertItemsEqual(*args) | ||
|
||
def setUp(self): | ||
super(AarEmbeddedProguardExtractor, self).setUp() | ||
os.chdir(os.environ["TEST_TMPDIR"]) | ||
|
||
def testNoProguardTxt(self): | ||
aar = zipfile.ZipFile(io.BytesIO(), "w") | ||
proguard_file = io.BytesIO() | ||
aar_embedded_proguard_extractor.ExtractEmbeddedProguard(aar, proguard_file) | ||
proguard_file.seek(0) | ||
self.assertEqual(b"", proguard_file.read()) | ||
|
||
def testWithProguardTxt(self): | ||
aar = zipfile.ZipFile(io.BytesIO(), "w") | ||
aar.writestr("proguard.txt", "hello world") | ||
proguard_file = io.BytesIO() | ||
aar_embedded_proguard_extractor.ExtractEmbeddedProguard(aar, proguard_file) | ||
proguard_file.seek(0) | ||
self.assertEqual(b"hello world", proguard_file.read()) | ||
|
||
|
||
if __name__ == "__main__": | ||
unittest.main() |
c8c0d94
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@benjaminRomano and @philwo, any chance this could get cherrypicked into 4.2, or is it too tightly coupled?
c8c0d94
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@cpsauer Can you add a comment to the 4.2 release issue so that we don't miss this request? The release manager will have a look whether it can be cherry-picked or not then. 😊
c8c0d94
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Donezo. (But figured I should ask you two, first.)
Thanks, both of you, for all you do!