Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

8292244: Remove unnecessary include directories #9835

Closed
wants to merge 2 commits into from

Conversation

djelinski
Copy link
Member

@djelinski djelinski commented Aug 11, 2022

Remove java.base:include from EXTRA_HEADER_DIRS.

The directory contains base versions of the files present in <build>/support/modules_include/java.base; the latter is automatically included in every JDK library build.

Verified that:

  • cl.exe command line contains -I<stuff>/modules_include/java.base
  • Windows, Linux and Mac builds still pass

Progress

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue

Issue

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk pull/9835/head:pull/9835
$ git checkout pull/9835

Update a local copy of the PR:
$ git checkout pull/9835
$ git pull https://git.openjdk.org/jdk pull/9835/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 9835

View PR using the GUI difftool:
$ git pr show -t 9835

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/9835.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Aug 11, 2022

👋 Welcome back djelinski! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@openjdk
Copy link

openjdk bot commented Aug 11, 2022

@djelinski The following labels will be automatically applied to this pull request:

  • build
  • client

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing lists. If you would like to change these labels, use the /label pull request command.

@openjdk openjdk bot added build build-dev@openjdk.org client client-libs-dev@openjdk.org labels Aug 11, 2022
@djelinski djelinski closed this Aug 11, 2022
@djelinski djelinski reopened this Aug 11, 2022
@djelinski djelinski changed the title Simplify includes 8292244 Aug 11, 2022
@openjdk openjdk bot changed the title 8292244 8292244: Remove unnecessary include directories Aug 11, 2022
@djelinski djelinski marked this pull request as ready for review August 11, 2022 12:33
@openjdk openjdk bot added the rfr Pull request is ready for review label Aug 11, 2022
@mlbridge
Copy link

mlbridge bot commented Aug 11, 2022

Webrevs

@openjdk
Copy link

openjdk bot commented Aug 11, 2022

@djelinski This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

After integration, the commit message for the final commit will be:

8292244: Remove unnecessary include directories

Reviewed-by: erikj, prr

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been 19 new commits pushed to the master branch:

As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Aug 11, 2022
Copy link
Contributor

@prrace prrace left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fine by me since as long as it really builds this is OK.

@djelinski
Copy link
Member Author

/integrate

@openjdk
Copy link

openjdk bot commented Aug 12, 2022

Going to push as commit 45e5b31.
Since your change was applied there have been 24 commits pushed to the master branch:

  • 9bfffa0: 8291945: Add OSInfo API for static OS information
  • bd58553: 8290833: Remove ConstantPoolCache::walk_entries_for_initialization()
  • 755ecf6: 8292153: x86: Represent Registers as values
  • dedc05c: 8291640: java/beans/XMLDecoder/8028054/Task.java should use the 3-arg Class.forName
  • 3d20a8b: 8291959: FileFontStrike#initNative does not properly initialize IG Table on Windows
  • a28ab7b: 8288568: Reduce runtime of java.security microbenchmarks
  • 7ea9ba1: 8292064: Convert java/lang/management/MemoryMXBean shell tests to java version
  • fc1d94e: 8292232: AIX build failure by JDK-8290840
  • a9bc149: 8292216: Remove modules/packages_unloading_do
  • 1c0f0f4: 8292077: G1 nmethod entry barriers don't keep oops alive
  • ... and 14 more: https://git.openjdk.org/jdk/compare/7b029ea6ba1d44d361fdf980816732d8454b8194...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Aug 12, 2022
@openjdk openjdk bot closed this Aug 12, 2022
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Aug 12, 2022
@openjdk
Copy link

openjdk bot commented Aug 12, 2022

@djelinski Pushed as commit 45e5b31.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

@djelinski djelinski deleted the simplify-includes branch October 20, 2022 11:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
build build-dev@openjdk.org client client-libs-dev@openjdk.org integrated Pull request has been integrated
4 participants