Skip to content

Commit 3b067c7

Browse files
author
Sergio Giro
committed
ojluni: tidy up ojluni files
Deleted files that are not being compiled Added script to check that the files under ojluni/src/main/java are the same as mentioned in the mk file. Test: make Bug: 29631070 Change-Id: Id1a62f7fbc52569ba5c8287571ae325d989bb5ad
1 parent 078fe3b commit 3b067c7

File tree

9 files changed

+38
-2337
lines changed

9 files changed

+38
-2337
lines changed

check-ojluni-files

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
#!/bin/bash
2+
3+
4+
# Copyright (C) 2016 The Android Open Source Project
5+
#
6+
# Licensed under the Apache License, Version 2.0 (the "License");
7+
# you may not use this file except in compliance with the License.
8+
# You may obtain a copy of the License at
9+
#
10+
# http://www.apache.org/licenses/LICENSE-2.0
11+
#
12+
# Unless required by applicable law or agreed to in writing, software
13+
# distributed under the License is distributed on an "AS IS" BASIS,
14+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
# See the License for the specific language governing permissions and
16+
# limitations under the License.
17+
18+
19+
##### Script to check whether the files openjdk_java_files.mk match
20+
##### those in the corresponding directory.
21+
COMMAND='diff <(for i in $(openjdk_java_files); do echo "\$$i"; done | sort) '
22+
COMMAND=${COMMAND}'<( find ojluni/src/main/java -type f | grep '\''\.java$$'\'' | sort )'
23+
24+
# Need to do it this nasty way (creating a Makefile on the fly and
25+
# executing the bash command inside it) as to read the openjdk_java_files
26+
# variable from an .mk file.
27+
make -s -f <(cat <<EOF
28+
include openjdk_java_files.mk
29+
check_openjdk_java_files: ; /bin/bash -c "$COMMAND"
30+
EOF)
31+
32+
if [ $? -eq 0 ]; then
33+
echo 'No differences found'
34+
else
35+
echo 'Differences found'
36+
exit 1
37+
fi
38+

ojluni/src/main/java/sun/nio/ch/DevPollArrayWrapper.java

Lines changed: 0 additions & 319 deletions
This file was deleted.

0 commit comments

Comments
 (0)