Upstream verification spreadsheet: Explicitly specify repositories to compare.
This CL changes the comparison command lines in the verification
spreadsheet to explicitly include the command line parameters of
the form:
-r ojluni,<revision>
to do a two-way comparison between the ojluni source and the particular
OpenJDK <revision> (eg. 8u121-b13) that is the expected upstream for the
particular file as of Android O / P.
This does not change behavior because:
- the current default value of the -r parameter for the upstream-diff
tool is "ojluni,expected"
- the snapshot "expected" contains a copy of the same upstream revision
identified by <revision> (ie. "-r ojluni,<revision>" is the same diff
as "-r ojluni,expected")
The advantage of passing -r as an explicit parameter is that the
behavior remains the same if the default value of the -r parameter of
upstream-diff changes in future; for example, the default behavior
might change in future to be a three-way comparison for integration of
future upstream changes, as opposed to (currently) defaulting to
verifying integration of the currently expected upstream.
Passing a particular <revision> rather than the verbatim string "expected"
communicates to the user of this command line what the expected revision is,
although it's less clear that this is an advantage. It also prepares us
for perhaps renaming "expected" to "android-p-reference" or similar in
future, when "expected" may no longer an appropriate name.
For reference, the expected upstream OpenJDK revision for each .java
file is currently (as of Android O / P):
- for java{,x}.sql: 7u40
- for files covered by JSR166 (java.util.concurrent and parts of
java.util): 8b113+
- for everything else: 8u121-b13
Test: Ran the following and tried some example command lines
include in the output:
make libcore-compare-upstreams && java -jar \
out/host/linux-x86/framework/libcore-compare-upstreams.jar
Bug: 63554956
Change-Id: I59cb9534ddf83e28490ecb41f42bd12b7c6b9470
1 file changed